linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] lockd shouldn't call posix_unblock_lock here
@ 2002-08-15 14:58 Matthew Wilcox
  0 siblings, 0 replies; only message in thread
From: Matthew Wilcox @ 2002-08-15 14:58 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, Trond Myklebust


nlmsvc_notify_blocked() is only called via the fl_notify() pointer which
is only called immediately after we already did a locks_delete_block(),
so calling posix_unblock_lock() here is always a NOP.  Please apply.

diff -urpNX dontdiff linux-2.5.31/fs/lockd/svclock.c linux-2.5.31-willy/fs/lockd/svclock.c
--- linux-2.5.31/fs/lockd/svclock.c	2002-08-01 14:16:16.000000000 -0700
+++ linux-2.5.31-willy/fs/lockd/svclock.c	2002-08-15 07:32:19.000000000 -0700
@@ -472,7 +472,6 @@ nlmsvc_notify_blocked(struct file_lock *
 	struct nlm_block	**bp, *block;
 
 	dprintk("lockd: VFS unblock notification for block %p\n", fl);
-	posix_unblock_lock(fl);
 	for (bp = &nlm_blocked; (block = *bp); bp = &block->b_next) {
 		if (nlm_compare_locks(&block->b_call.a_args.lock.fl, fl)) {
 			nlmsvc_insert_block(block, 0);

-- 
Revolutions do not require corporate support.

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2002-08-15 14:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-08-15 14:58 [PATCH] lockd shouldn't call posix_unblock_lock here Matthew Wilcox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).