summaryrefslogtreecommitdiffstats
path: root/fs/locks.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@fieldses.org>2006-01-03 09:55:46 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-01-06 14:58:54 -0500
commit64a318ee2af9000df482d7a125c3b3e1f1007404 (patch)
tree7b39e558cccce484635dc847a016bbcb5e83abdb /fs/locks.c
parent2c5acd2e1a73cad59203a1bace21e6b03f2920a9 (diff)
downloadlinux-64a318ee2af9000df482d7a125c3b3e1f1007404.tar.bz2
NLM: Further cancel fixes
If the server receives an NLM cancel call and finds no waiting lock to cancel, then chances are the lock has already been applied, and the client just hadn't yet processed the NLM granted callback before it sent the cancel. The Open Group text, for example, perimts a server to return either success (LCK_GRANTED) or failure (LCK_DENIED) in this case. But returning an error seems more helpful; the client may be able to use it to recognize that a race has occurred and to recover from the race. So, modify the relevant functions to return an error in this case. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/locks.c')
-rw-r--r--fs/locks.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c
index 75650d52fe60..fb32d6218e21 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1958,13 +1958,18 @@ EXPORT_SYMBOL(posix_block_lock);
*
* lockd needs to block waiting for locks.
*/
-void
+int
posix_unblock_lock(struct file *filp, struct file_lock *waiter)
{
+ int status = 0;
+
lock_kernel();
if (waiter->fl_next)
__locks_delete_block(waiter);
+ else
+ status = -ENOENT;
unlock_kernel();
+ return status;
}
EXPORT_SYMBOL(posix_unblock_lock);