diff options
author | Julia Lawall <julia@diku.dk> | 2011-07-09 18:04:39 +0200 |
---|---|---|
committer | Joel Becker <jlbec@evilplan.org> | 2011-11-17 10:46:46 +0100 |
commit | fc9f899483435935c1cd7005df29681929d1c99b (patch) | |
tree | c7ad164cfcfc16e5fb155e0ea3d3039eb47f0def /fs/ocfs2/dlm/dlmlock.c | |
parent | Merge branch 'mw-3.1-jul25' of git://oss.oracle.com/git/smushran/linux-2.6 in... (diff) | |
download | linux-fc9f899483435935c1cd7005df29681929d1c99b.tar.xz linux-fc9f899483435935c1cd7005df29681929d1c99b.zip |
fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_free
Memory allocated using kmem_cache_zalloc should be freed using
kmem_cache_free, not kfree.
The semantic patch that fixes this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x,e,e1,e2;
@@
x = kmem_cache_zalloc(e1,e2)
... when != x = e
?-kfree(x)
+kmem_cache_free(e1,x)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Joel Becker <jlbec@evilplan.org>
Diffstat (limited to 'fs/ocfs2/dlm/dlmlock.c')
-rw-r--r-- | fs/ocfs2/dlm/dlmlock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c index f32fcba04923..975810b98492 100644 --- a/fs/ocfs2/dlm/dlmlock.c +++ b/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; |