libmount: more robust flock() usage

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/shlibs/mount/src/tab_update.c b/shlibs/mount/src/tab_update.c
index d66b64f940392adf9d754dd2a66aba301af38179..2084b5861c0ea9b8daa6b6bb7d8207f0cf3c4b35 100644 (file)
--- a/shlibs/mount/src/tab_update.c
+++ b/shlibs/mount/src/tab_update.c
@@ -616,8 +616,12 @@ static int utab_lock(const char *filename)
 
        if (fd < 0)
                return -errno;
-       if (flock(fd, LOCK_EX)) {
-               int errsv = errno;
+
+       while (flock(fd, LOCK_EX) < 0) {
+               int errsv;
+               if ((errno == EAGAIN) || (errno == EINTR))
+                       continue;
+               errsv = errno;
                close(fd);
                return -errsv;
        }