diff --git a/[refs] b/[refs]
index d1e31f27406c..f8d80e413ccc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fe87f02a04ad6e7075023a87fe38eb458a4bb9d
+refs/heads/master: 6b70c9559bcf381a6521e38b0dd5d3d4d905868a
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
index e9c5ba9084fc..ddb012a68023 100644
--- a/trunk/fs/cifs/file.c
+++ b/trunk/fs/cifs/file.c
@@ -752,6 +752,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
 			int stored_rc = 0;
 			struct cifsLockInfo *li, *tmp;
 
+			rc = 0;
 			down(&fid->lock_sem);
 			list_for_each_entry_safe(li, tmp, &fid->llist, llist) {
 				if (pfLock->fl_start <= li->offset &&
@@ -766,7 +767,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
 					kfree(li);
 				}
 			}
-		up(&fid->lock_sem);
+			up(&fid->lock_sem);
 		}
 	}