From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 26 Sep 2008 17:27:23 +0000 (-0400)
Subject: nfs-utils: Remove unused function rpc_svcrun()
X-Git-Tag: nfs-utils-1-1-4~19
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=06d0b0c9d3f1727d6a7f51d9edd7c3e7c38a293a

nfs-utils: Remove unused function rpc_svcrun()

Clean up: remove function that has been disabled (via #if 0) for almost a
decade.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/support/include/rpcmisc.h b/support/include/rpcmisc.h
index 665df8e..35c5011 100644
--- a/support/include/rpcmisc.h
+++ b/support/include/rpcmisc.h
@@ -46,7 +46,6 @@ int		makesock(int port, int proto);
 void		rpc_init(char *name, int prog, int vers,
 				void (*dispatch)(struct svc_req *, SVCXPRT *),
 				int defport);
-void		rpc_svcrun(void);
 void		rpc_dispatch(struct svc_req *rq, SVCXPRT *xprt,
 				struct rpc_dtable *dtable, int nvers,
 				void *argp, void *resp);
diff --git a/support/nfs/rpcdispatch.c b/support/nfs/rpcdispatch.c
index 3d34774..502fc5f 100644
--- a/support/nfs/rpcdispatch.c
+++ b/support/nfs/rpcdispatch.c
@@ -61,54 +61,3 @@ rpc_dispatch(struct svc_req *rqstp, SVCXPRT *transp,
 		exit (2);
 	}
 }
-
-#if 0
-/*
- * This is our replacement for svc_run. It turns off some signals while
- * executing the server procedures to avoid nasty race conditions.
- */
-void
-rpc_svcrun(fd_set *morefds, void (*func)(int fd))
-{
-	sigset_t	block, current;
-	fd_set		readfds;
-
-	for (;;) {
-		readfds = svc_fdset;
-		if (morefds) {
-			int	i;
-
-			/* most efficient */
-			for (i = 0; i < FD_SETSIZE; i++)
-				if (FD_ISSET(i, morefds))
-					FD_SET(i, &readfs);
-		}
-		switch (select(FD_SETSIZE, &readfds, NULL, NULL, NULL)) {
-		case -1:
-			if (errno == EINTR)
-				continue;
-			xlog(L_ERROR, "svc_run: - select failed");
-			break;
-		case 0:
-			continue;
-		default:
-			if (morefds) {
-				int	i;
-
-				/* most efficient */
-				for (i = 0; i < FD_SETSIZE; i++)
-					if (FD_ISSET(i, morefds) &&
-					    FD_ISSET(i, &readfds))
-						func(i);
-			}
-			sigemptyset(&block);
-			sigaddset(&block, SIGALRM);
-			sigaddset(&block, SIGVTALRM);
-			sigaddset(&block, SIGIO);
-			sigprocmask(SIG_BLOCK, &block, &current);
-			svc_getreqset(&readfds);
-			sigprocmask(SIG_SETMASK, &current, NULL);
-		}
-	}
-}
-#endif