Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8f8ca51 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

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

* commit '651cb804':
  RRO: idmap: allow flock(2) to block
parents 41bf75c6 651cb804

cmds/idmap/create.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }