[utils] locked_file
: Fix for virtiofs (#6840)
Authored by: brandon-dacrib Closes #6823
This commit is contained in:
parent
2f07c4c1da
commit
45998b3e37
1 changed files with 5 additions and 4 deletions
|
@ -2187,10 +2187,11 @@ else:
|
|||
fcntl.lockf(f, flags)
|
||||
|
||||
def _unlock_file(f):
|
||||
try:
|
||||
fcntl.flock(f, fcntl.LOCK_UN)
|
||||
except OSError:
|
||||
fcntl.lockf(f, fcntl.LOCK_UN)
|
||||
with contextlib.suppress(OSError):
|
||||
return fcntl.flock(f, fcntl.LOCK_UN)
|
||||
with contextlib.suppress(OSError):
|
||||
return fcntl.lockf(f, fcntl.LOCK_UN) # AOSP does not have flock()
|
||||
return fcntl.flock(f, fcntl.LOCK_UN | fcntl.LOCK_NB) # virtiofs needs LOCK_NB on unlocking
|
||||
|
||||
except ImportError:
|
||||
|
||||
|
|
Loading…
Reference in a new issue