commit fe1934e470681ff7ec5b8ec0609ae9fe24bd7282
author Adam Lesinski <adamlesinski@google.com> Mon Oct 12 19:30:23 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 12 19:30:23 2015 +0000
tree c9f136e75d80646ff44cdac94070d3109ddf13d4
parent bac309ca8f4ecd1a835aa36f4be2a1fa45577eab
parent df1a5b22cdbd5c453cf19d5c771b66dbc6e82f48

Merge "RRO: idmap: allow flock(2) to block"

cmds/idmap/create.cpp

diff --git a/cmds/idmap/create.cpp b/cmds/idmap/create.cpp
index 41395f1..9d60ee1 100644
--- a/cmds/idmap/create.cpp
+++ b/cmds/idmap/create.cpp
@@ -41,7 +41,7 @@
             ALOGD("error: fchmod %s: %s\n", path, strerror(errno));
             goto fail;
         }
-        if (TEMP_FAILURE_RETRY(flock(fd, LOCK_EX | LOCK_NB)) != 0) {
+        if (TEMP_FAILURE_RETRY(flock(fd, LOCK_EX)) != 0) {
             ALOGD("error: flock %s: %s\n", path, strerror(errno));
             goto fail;
         }