The patch titled
Subject: ocfs2: fix memory leak in dlm_migrate_request_handler()
has been added to the -mm tree. Its filename is
ocfs2-free-the-mle-while-the-res-had-one-to-avoid-mle-memory-leak.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-free-the-mle-while-the-res-had-one-to-avoid-mle-memory-leak.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-free-the-mle-while-the-res-had-one-to-avoid-mle-memory-leak.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Guozhonghua <guozhonghua@xxxxxxx>
Subject: ocfs2: fix memory leak in dlm_migrate_request_handler()
In the dlm_migrate_request_handler(), when `ret' is --EEXIST, the mle
should be freed, otherwise the memory will be leaked.
Link: http://lkml.kernel.org/r/71604351584F6A4EBAE558C676F37CA4A3D3522A@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Signed-off-by: Guozhonghua <guozhonghua@xxxxxxx>
Cc: Eric Ren <zren@xxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx>
Cc: Joseph Qi <joseph.qi@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dlm/dlmmaster.c | 3 +++
1 file changed, 3 insertions(+)
diff -puN fs/ocfs2/dlm/dlmmaster.c~ocfs2-free-the-mle-while-the-res-had-one-to-avoid-mle-memory-leak fs/ocfs2/dlm/dlmmaster.c
--- a/fs/ocfs2/dlm/dlmmaster.c~ocfs2-free-the-mle-while-the-res-had-one-to-avoid-mle-memory-leak
+++ a/fs/ocfs2/dlm/dlmmaster.c
@@ -3188,6 +3188,9 @@ int dlm_migrate_request_handler(struct o
migrate->new_master,
migrate->master);
+ if (ret < 0)
+ kmem_cache_free(dlm_mle_cache, mle);
+
spin_unlock(&dlm->master_lock);
unlock:
spin_unlock(&dlm->spinlock);
_
Patches currently in -mm which might be from guozhonghua@xxxxxxx are
ocfs2-free-the-mle-while-the-res-had-one-to-avoid-mle-memory-leak.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
