---

yaml --- r: 276186 b: refs/heads/master c: fc9f899 h: refs/heads/master v: v3
git-mirror · Nov 17, 2011 · 8dc78d3 · 8dc78d3
1 parent 3761ab5
commit 8dc78d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;