summaryrefslogtreecommitdiffstats
path: root/fs/cifs/file.c
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2013-06-21 08:58:10 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-06-29 12:57:38 +0400
commit1a9e64a7118c5ad13dd5119da18375a5bd45b330 (patch)
tree823bc4983b7581c0096b0c3421eab86f41e1953d /fs/cifs/file.c
parentf891a29f46553a384edbaa0f6ac446b1d03bccac (diff)
downloadop-kernel-dev-1a9e64a7118c5ad13dd5119da18375a5bd45b330.zip
op-kernel-dev-1a9e64a7118c5ad13dd5119da18375a5bd45b330.tar.gz
cifs: use posix_unblock_lock instead of locks_delete_block
commit 66189be74 (CIFS: Fix VFS lock usage for oplocked files) exported the locks_delete_block symbol. There's already an exported helper function that provides this capability however, so make cifs use that instead and turn locks_delete_block back into a static function. Note that if fl->fl_next == NULL then this lock has already been through locks_delete_block(), so we should be OK to ignore an ENOENT error here and simply not retry the lock. Cc: Pavel Shilovsky <piastryyy@gmail.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Acked-by: J. Bruce Fields <bfields@fieldses.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/cifs/file.c')
-rw-r--r--fs/cifs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 48b29d2..1686e40 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -999,7 +999,7 @@ try_again:
rc = wait_event_interruptible(flock->fl_wait, !flock->fl_next);
if (!rc)
goto try_again;
- locks_delete_block(flock);
+ posix_unblock_lock(flock);
}
return rc;
}
OpenPOWER on IntegriCloud