Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'fe1934e470681ff7ec5b8ec0609ae9fe24bd7282':
  RRO: idmap: allow flock(2) to block
This commit is contained in:
Adam Lesinski
2015-10-12 19:34:43 +00:00
committed by Android Git Automerger
parent 287cd2d1e4 fe1934e470
commit 651cb804b1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/idmap/create.cpp
View File

@@ -41,7 +41,7 @@ namespace {
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;
}