---

yaml --- r: 190942 b: refs/heads/master c: 2c964d1 h: refs/heads/master v: v3
git-mirror · Apr 21, 2010 · c383b9f · c383b9f
1 parent 8eb7829
commit c383b9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f19159dc5ab9ec28c3b8230689101335d98e2d68
+refs/heads/master: 2c964d1f7c87eb71f7902111cd7c8fbba225e4b6
diff --git a/trunk/fs/cifs/file.c b/trunk/fs/cifs/file.c
@@ -922,9 +922,10 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
 							1, 0, li->type, false);
 					if (stored_rc)
 						rc = stored_rc;
-
-					list_del(&li->llist);
-					kfree(li);
+					else {
+						list_del(&li->llist);
+						kfree(li);
+					}
 				}
 			}
 			mutex_unlock(&fid->lock_mutex);