From: Pavel Shilovsky <piastry@etersoft.ru>
Date: Wed, 28 Mar 2012 13:10:25 +0000 (+0400)
Subject: CIFS: Separate protocol specific part from setlk
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7f92447aa7be605fd80d9f248efe0b8ac9379f11;p=linux-beck.git

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 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;