mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
NLM: don't unlock on cancel requests
Currently when lockd gets an NLM_CANCEL request, it also does an unlock for the same range. This is incorrect. The Open Group documentation says that "This procedure cancels an *outstanding* blocked lock request." (Emphasis mine.) Also, consider a client that holds a lock on the first byte of a file, and requests a lock on the entire file. If the client cancels that request (perhaps because the requesting process is signalled), the server shouldn't apply perform an unlock on the entire file, since that will also remove the previous lock that the client was already granted. Or consider a lock request that actually *downgraded* an exclusive lock to a shared lock. Signed-off-by: J. Bruce Fields <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
This commit is contained in:
parent
f232142cc2
commit
5996a298da
2 changed files with 2 additions and 16 deletions
|
|
@ -240,11 +240,6 @@ nlmsvc_delete_block(struct nlm_block *block, int unlock)
|
|||
nlmsvc_remove_block(block);
|
||||
if (fl->fl_next)
|
||||
posix_unblock_lock(file->f_file, fl);
|
||||
if (unlock) {
|
||||
fl->fl_type = F_UNLCK;
|
||||
posix_lock_file(file->f_file, fl);
|
||||
block->b_granted = 0;
|
||||
}
|
||||
|
||||
/* If the block is in the middle of a GRANT callback,
|
||||
* don't kill it yet. */
|
||||
|
|
|
|||
Loading…
Reference in a new issue