From 8dc78d32d572fea7a16c930099246c9ad9807866 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 9 Jul 2011 18:04:39 +0200
Subject: [PATCH] --- yaml --- r: 276186 b: refs/heads/master c:
 fc9f899483435935c1cd7005df29681929d1c99b h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/fs/ocfs2/dlm/dlmlock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 67764cbf2384..1443d02df864 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99b1bb61b225c3eb4d3b196d4f1d041695b19a7e
+refs/heads/master: fc9f899483435935c1cd7005df29681929d1c99b
diff --git a/trunk/fs/ocfs2/dlm/dlmlock.c b/trunk/fs/ocfs2/dlm/dlmlock.c
index f32fcba04923..975810b98492 100644
--- a/trunk/fs/ocfs2/dlm/dlmlock.c
+++ b/trunk/fs/ocfs2/dlm/dlmlock.c
@@ -438,7 +438,7 @@ struct dlm_lock * dlm_new_lock(int type, u8 node, u64 cookie,
 		/* zero memory only if kernel-allocated */
 		lksb = kzalloc(sizeof(*lksb), GFP_NOFS);
 		if (!lksb) {
-			kfree(lock);
+			kmem_cache_free(dlm_lock_cache, lock);
 			return NULL;
 		}
 		kernel_allocated = 1;