From: Ben Myers <bpm@sgi.com>
Date: Fri, 12 Feb 2010 18:58:57 +0000 (-0500)
Subject: nfs-utils: remove xflock timeout
X-Git-Tag: nfs-utils-1-2-2~9
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=a797fe77beb2748bebfa84e4d1d9033fbd65da57;p=nfs-utils.git

nfs-utils: remove xflock timeout

Remove this 10 second timeout which can cause unexpected behavior and
corruption in the rmtab when hit.

Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/support/nfs/xio.c b/support/nfs/xio.c
index 5e2e1e9..e3d27d2 100644
--- a/support/nfs/xio.c
+++ b/support/nfs/xio.c
@@ -44,16 +44,9 @@ xfclose(XFILE *xfp)
 	xfree(xfp);
 }
 
-static void
-doalarm(int sig)
-{
-	return;
-}
-
 int
 xflock(char *fname, char *type)
 {
-	struct sigaction sa, oldsa;
 	int		readonly = !strcmp(type, "r");
 	struct flock	fl = { readonly? F_RDLCK : F_WRLCK, SEEK_SET, 0, 0, 0 };
 	int		fd;
@@ -68,21 +61,12 @@ xflock(char *fname, char *type)
 		return -1;
 	}
 
-	sa.sa_handler = doalarm;
-	sa.sa_flags = 0;
-	sigemptyset(&sa.sa_mask);
-	sigaction(SIGALRM, &sa, &oldsa);
-	alarm(10);
 	if (fcntl(fd, F_SETLKW, &fl) < 0) {
-		alarm(0);
 		xlog(L_WARNING, "failed to lock %s: errno %d (%s)",
 				fname, errno, strerror(errno));
 		close(fd);
-		fd = 0;
-	} else {
-		alarm(0);
+		fd = -1;
 	}
-	sigaction(SIGALRM, &oldsa, NULL);
 
 	return fd;
 }