From c383b9f8981e2f8ff8e43558a685541ccb475213 Mon Sep 17 00:00:00 2001
From: Pavel Shilovsky <piastryyy@gmail.com>
Date: Wed, 21 Apr 2010 19:44:24 +0000
Subject: [PATCH] --- yaml --- r: 190942 b: refs/heads/master c:
 2c964d1f7c87eb71f7902111cd7c8fbba225e4b6 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/cifs/file.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 45db1dfdb20a..cce10e1b3b58 100644
--- 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
index 99897e3562a7..2ba4c41be972 100644
--- 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);