From: Pavel Shilovsky <piastry@etersoft.ru>
Date: Thu, 22 Nov 2012 14:56:39 +0000 (+0400)
Subject: CIFS: Fix lock consistensy bug in cifs_setlk
X-Git-Tag: v3.8-rc1~148^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21cb2d90c76cbc951da3a266f0dd439d64f3114a;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

CIFS: Fix lock consistensy bug in cifs_setlk

If we netogiate mandatory locking style, have a read lock and try
to set a write lock we end up with a write lock in vfs cache and
no lock in cifs lock cache - that's wrong. Fix it by returning
from cifs_setlk immediately if a error occurs during setting a lock.

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <smfrench@gmail.com>
---

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 67fe0b8..bceffa8 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -1443,16 +1443,18 @@ cifs_setlk(struct file *file, struct file_lock *flock, __u32 type,
 			return -ENOMEM;
 
 		rc = cifs_lock_add_if(cfile, lock, wait_flag);
-		if (rc < 0)
+		if (rc < 0) {
 			kfree(lock);
-		if (rc <= 0)
+			return rc;
+		}
+		if (!rc)
 			goto out;
 
 		rc = server->ops->mand_lock(xid, cfile, flock->fl_start, length,
 					    type, 1, 0, wait_flag);
 		if (rc) {
 			kfree(lock);
-			goto out;
+			return rc;
 		}
 
 		cifs_lock_add(cfile, lock);