(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.

1 files changed, 6 insertions, 8 deletions

diff --git a/sunrpc/svc.c b/sunrpc/svc.c
index 1e358e247c..6caf8412d5 100644
--- a/sunrpc/svc.c
+++ b/sunrpc/svc.c
@@ -372,7 +372,7 @@ svc_getreqset (fd_set *readfds)
     setsize = FD_SETSIZE;
   maskp = readfds->fds_bits;
   for (sock = 0; sock < setsize; sock += NFDBITS)
-    for (mask = *maskp++; (bit = ffsl (mask)); mask ^= (1L << (bit - 1)))
+    for (mask = *maskp++; (bit = ffs (mask)); mask ^= (1 << (bit - 1)))
       INTUSE(svc_getreq_common) (sock + bit - 1);
 }
 INTDEF (svc_getreqset)
@@ -380,24 +380,22 @@ INTDEF (svc_getreqset)
 void
 svc_getreq_poll (struct pollfd *pfdp, int pollretval)
 {
-  if (pollretval == 0)
-    return;
-
+  register int i;
   register int fds_found;
-  for (int i = fds_found = 0; i < svc_max_pollfd; ++i)
+
+  for (i = fds_found = 0; i < svc_max_pollfd && fds_found < pollretval; ++i)
     {
       register struct pollfd *p = &pfdp[i];
 
       if (p->fd != -1 && p->revents)
 	{
 	  /* fd has input waiting */
+	  ++fds_found;
+
 	  if (p->revents & POLLNVAL)
 	    xprt_unregister (xports[p->fd]);
 	  else
 	    INTUSE(svc_getreq_common) (p->fd);
-
-	  if (++fds_found >= pollretval)
-	    break;
 	}
     }
 }