Merge "RRO: idmap: allow flock(2) to block"
This commit is contained in:
@@ -41,7 +41,7 @@ namespace {
|
|||||||
ALOGD("error: fchmod %s: %s\n", path, strerror(errno));
|
ALOGD("error: fchmod %s: %s\n", path, strerror(errno));
|
||||||
goto fail;
|
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));
|
ALOGD("error: flock %s: %s\n", path, strerror(errno));
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user