summaryrefslogtreecommitdiff
path: root/fs/cifs
diff options
context:
space:
mode:
authorPavel Shilovsky <piastry@etersoft.ru>2012-11-22 18:56:39 +0400
committerSteve French <smfrench@gmail.com>2012-12-05 13:27:29 -0600
commit21cb2d90c76cbc951da3a266f0dd439d64f3114a (patch)
treeb38829c87f5be4c9da6c2bfdb11fd5a7ec4e98fb /fs/cifs
parentf152fd5fffa78910c467b17f12d0aa060aa408a6 (diff)
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>
Diffstat (limited to 'fs/cifs')
-rw-r--r--fs/cifs/file.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 67fe0b811f23..bceffa8c034e 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);