Commit a282a1fa authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Arnd Bergmann
Browse files

lockd: fix nlmsvc_notify_blocked locking 



nlmsvc_notify_blocked walks the nlm_blocked list,
which requires nlm_blocked_lock.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 763641d8

fs/lockd/svclock.c

+4 −2
Original line number Diff line number Diff line
@@ -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");

}