From: Neil Brown <neilb@suse.de>
Date: Mon, 19 Mar 2007 00:12:34 +0000 (+1100)
Subject: Work around svc_getreqset in glibc 3
X-Git-Tag: nfs-utils-1-1-0-rc1~47
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=97ccd3d1b61f20cd681a82089e83c58f97438f1a;p=nfs-utils.git

Work around svc_getreqset in glibc 3

Without this fix, mountd ignores sockets with filedescriptor > 31,
so if there are more than about 26 concurrent connections, mountd
starts spinning.
---

diff --git a/utils/mountd/svc_run.c b/utils/mountd/svc_run.c
index 7a8a595..422e839 100644
--- a/utils/mountd/svc_run.c
+++ b/utils/mountd/svc_run.c
@@ -57,6 +57,32 @@
 void cache_set_fds(fd_set *fdset);
 int cache_process_req(fd_set *readfds);
 
+#if LONG_MAX != INT_MAX	
+/* bug in glibc 2.3.6 and earlier, we need
+ * our own svc_getreqset
+ */
+static void
+my_svc_getreqset (fd_set *readfds)
+{
+	fd_mask mask;
+	fd_mask *maskp;
+	int setsize;
+	int sock;
+	int bit;
+
+	setsize = _rpc_dtablesize ();
+	if (setsize > FD_SETSIZE)
+		setsize = FD_SETSIZE;
+	maskp = readfds->fds_bits;
+	for (sock = 0; sock < setsize; sock += NFDBITS)
+		for (mask = *maskp++;
+		     (bit = ffsl (mask));
+		     mask ^= (1L << (bit - 1)))
+			svc_getreq_common (sock + bit - 1);
+}
+#define svc_getreqset my_svc_getreqset
+
+#endif
 
 /*
  * The heart of the server.  A crib from libc for the most part...