CIFS: Fix VFS lock usage for oplocked files
authorPavel Shilovsky <piastry@etersoft.ru>
Wed, 28 Mar 2012 17:56:19 +0000 (21:56 +0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Apr 2012 15:33:48 +0000 (08:33 -0700)
commit2d5e264758e31dd1d1e609a5a4d3d6dc693b9d2e
tree8517ff86145e1b564bd131de11c542dc545b31fa
parentfdf8d98d89726f435f4d7f89fc898340c2f47bc9
CIFS: Fix VFS lock usage for oplocked files

commit 66189be74ff5f9f3fd6444315b85be210d07cef2 upstream.

We can deadlock if we have a write oplock and two processes
use the same file handle. In this case the first process can't
unlock its lock if the second process blocked on the lock in the
same time.

Fix it by using posix_lock_file rather than posix_lock_file_wait
under cinode->lock_mutex. If we request a blocking lock and
posix_lock_file indicates that there is another lock that prevents
us, wait untill that lock is released and restart our call.

Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/cifs/file.c
fs/locks.c
include/linux/fs.h