CIFS: Separate protocol specific part from setlk

Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 9c2d85d8e5e138fdec848bbec163df275354a1b3..ed9b5a8fb51fbb7f207c6196739802dd7c153553 100644 (file)
--- 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;