adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

NLM: don't unlock on cancel requests

Browse source 
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 <bfields@citi.umich.edu>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
J. Bruce Fields 2006-01-03 09:55:44 +01:00 committed by Trond Myklebust
parent f232142cc2
commit 5996a298da
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/lockd/svclock.c
View file

@ -240,11 +240,6 @@ nlmsvc_delete_block(struct nlm_block *block, int unlock)
nlmsvc_remove_block(block); nlmsvc_remove_block(block);
if (fl->fl_next) if (fl->fl_next)
posix_unblock_lock(file->f_file, fl); 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, /* If the block is in the middle of a GRANT callback,
* don't kill it yet. */ * don't kill it yet. */

13
fs/locks.c
View file

@ -1961,19 +1961,10 @@ EXPORT_SYMBOL(posix_block_lock);
void void
posix_unblock_lock(struct file *filp, struct file_lock *waiter) posix_unblock_lock(struct file *filp, struct file_lock *waiter)
{ {
/*
* A remote machine may cancel the lock request after it's been
* granted locally. If that happens, we need to delete the lock.
*/
lock_kernel(); lock_kernel();
if (waiter->fl_next) { if (waiter->fl_next)
__locks_delete_block(waiter); __locks_delete_block(waiter);
unlock_kernel(); unlock_kernel();
} else {
unlock_kernel();
waiter->fl_type = F_UNLCK;
posix_lock_file(filp, waiter);
}
} }
EXPORT_SYMBOL(posix_unblock_lock); EXPORT_SYMBOL(posix_unblock_lock);