From: Karel Zak <kzak@redhat.com>
Date: Fri, 18 Feb 2011 09:53:50 +0000 (+0100)
Subject: Revert "libmount: do not check for EAGAIN after flock()"
X-Git-Tag: v2.20-rc1~544
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b7cb8687f98c54dcbceae65ac58f3a0d0d0b5d4;p=thirdparty%2Futil-linux.git

Revert "libmount: do not check for EAGAIN after flock()"

 Linux is not 100% POSIX compatible in this area...
 strace: "flock(3, LOCK_EX|LOCK_NB)   = -1 EAGAIN (Resource temporarily unavailable)"

This reverts commit 78d8c28f746bcc8d4e642c39669d8e58dea8d029.
---

diff --git a/shlibs/mount/src/tab_update.c b/shlibs/mount/src/tab_update.c
index 6b7b4beffc..5373e2fa20 100644
--- a/shlibs/mount/src/tab_update.c
+++ b/shlibs/mount/src/tab_update.c
@@ -619,7 +619,7 @@ static int utab_lock(const char *filename)
 
 	while (flock(fd, LOCK_EX) < 0) {
 		int errsv;
-		if (errno == EINTR)
+		if ((errno == EAGAIN) || (errno == EINTR))
 			continue;
 		errsv = errno;
 		close(fd);