diff options
| author | Pavel Shilovsky <piastry@etersoft.ru> | 2012-03-28 19:56:19 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2012-04-01 20:54:27 +0200 |
| commit | 66189be74ff5f9f3fd6444315b85be210d07cef2 (patch) | |
| tree | 7a179ddd7e233668dbb108faf847ceb768d2e92c /fs/locks.c | |
| parent | Revert "CIFS: Fix VFS lock usage for oplocked files" (diff) | |
| download | linux-66189be74ff5f9f3fd6444315b85be210d07cef2.tar.xz linux-66189be74ff5f9f3fd6444315b85be210d07cef2.zip | |
CIFS: Fix VFS lock usage for oplocked files
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.
Cc: stable@kernel.org
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index 637694bf3a03..0d68f1f81799 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -510,12 +510,13 @@ static void __locks_delete_block(struct file_lock *waiter) /* */ -static void locks_delete_block(struct file_lock *waiter) +void locks_delete_block(struct file_lock *waiter) { lock_flocks(); __locks_delete_block(waiter); unlock_flocks(); } +EXPORT_SYMBOL(locks_delete_block); /* Insert waiter into blocker's block list. * We use a circular list so that processes can be easily woken up in |