---

yaml --- r: 218361 b: refs/heads/master c: a282a1f h: refs/heads/master i: 218359: c2cb27c v: v3
git-mirror · Oct 27, 2010 · 8b3f288 · 8b3f288
1 parent 99452d1
commit 8b3f288
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 763641d81202834e9d64de2019d1edec12868f4f
+refs/heads/master: a282a1fa6b23bd21ba0b86e53ed2a316b001836f
diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c
@@ -700,14 +700,16 @@ nlmsvc_notify_blocked(struct file_lock *fl)
 	struct nlm_block	*block;
 
 	dprintk("lockd: VFS unblock notification for block %p\n", fl);
+	spin_lock(&nlm_blocked_lock);
 	list_for_each_entry(block, &nlm_blocked, b_list) {
 		if (nlm_compare_locks(&block->b_call->a_args.lock.fl, fl)) {
-			nlmsvc_insert_block(block, 0);
+			nlmsvc_insert_block_locked(block, 0);
+			spin_unlock(&nlm_blocked_lock);
 			svc_wake_up(block->b_daemon);
 			return;
 		}
 	}
-
+	spin_unlock(&nlm_blocked_lock);
 	printk(KERN_WARNING "lockd: notification for unknown block!\n");
 }