summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorPavel Shilovsky <piastry@etersoft.ru>2012-03-28 15:10:25 +0200
committerPavel Shilovsky <piastry@etersoft.ru>2012-05-17 11:07:48 +0200
commit7f92447aa7be605fd80d9f248efe0b8ac9379f11 (patch)
tree5bf3e1b298034b82519061763ac787624f8bb56a /fs
parentCIFS: Separate protocol specific part from getlk (diff)
downloadlinux-7f92447aa7be605fd80d9f248efe0b8ac9379f11.tar.xz
linux-7f92447aa7be605fd80d9f248efe0b8ac9379f11.zip
CIFS: Separate protocol specific part from setlk
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 9c2d85d8e5e1..ed9b5a8fb51f 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1357,8 +1357,8 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type,
if (rc <= 0)
goto out;
- rc = CIFSSMBLock(xid, tcon, netfid, current->tgid, length,
- flock->fl_start, 0, 1, type, wait_flag, 0);
+ rc = cifs_mandatory_lock(xid, cfile, flock->fl_start, length,
+ type, 1, 0, wait_flag);
if (rc) {
kfree(lock);
goto out;