From: Petr Uzel <petr.uzel@suse.cz>
Date: Wed, 9 Feb 2011 12:14:04 +0000 (+0100)
Subject: libuuid: do not check for EAGAIN after flock()
X-Git-Tag: v2.19~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6c8d399b93f4646a90d0180fdcc1be35235a9c7;p=thirdparty%2Futil-linux.git

libuuid: do not check for EAGAIN after flock()

As per flock() manpage, flock() does not set errno=EAGAIN.

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---

diff --git a/shlibs/uuid/src/gen_uuid.c b/shlibs/uuid/src/gen_uuid.c
index 720fda4340..e567b297f5 100644
--- a/shlibs/uuid/src/gen_uuid.c
+++ b/shlibs/uuid/src/gen_uuid.c
@@ -333,7 +333,7 @@ static int get_clock(uint32_t *clock_high, uint32_t *clock_low,
 	if (state_fd >= 0) {
 		rewind(state_f);
 		while (flock(state_fd, LOCK_EX) < 0) {
-			if ((errno == EAGAIN) || (errno == EINTR))
+			if (errno == EINTR)
 				continue;
 			fclose(state_f);
 			close(state_fd);