The patch titled
Subject: ocfs2/dlm: should put mle when goto kill in dlm_assert_master_handler
has been added to the -mm tree. Its filename is
ocfs2-dlm-should-put-mle-when-goto-kill-in-dlm_assert_master_handler.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-dlm-should-put-mle-when-goto-kill-in-dlm_assert_master_handler.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-dlm-should-put-mle-when-goto-kill-in-dlm_assert_master_handler.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: alex chen <alex.chen@xxxxxxxxxx>
Subject: ocfs2/dlm: should put mle when goto kill in dlm_assert_master_handler
In dlm_assert_master_handler, the mle is get in dlm_find_mle, should be
put when goto kill, otherwise, this mle will never be released.
Signed-off-by: Alex Chen <alex.chen@xxxxxxxxxx>
Reviewed-by: Joseph Qi <joseph.qi@xxxxxxxxxx>
Reviewed-by: joyce.xue <xuejiufei@xxxxxxxxxx>
Cc: Mark Fasheh <mfasheh@xxxxxxxx>
Cc: Joel Becker <jlbec@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/ocfs2/dlm/dlmmaster.c | 4 ++++
1 file changed, 4 insertions(+)
diff -puN fs/ocfs2/dlm/dlmmaster.c~ocfs2-dlm-should-put-mle-when-goto-kill-in-dlm_assert_master_handler fs/ocfs2/dlm/dlmmaster.c
--- a/fs/ocfs2/dlm/dlmmaster.c~ocfs2-dlm-should-put-mle-when-goto-kill-in-dlm_assert_master_handler
+++ a/fs/ocfs2/dlm/dlmmaster.c
@@ -2020,6 +2020,10 @@ kill:
"and killing the other node now! This node is OK and can continue.\n");
__dlm_print_one_lock_resource(res);
spin_unlock(&res->spinlock);
+ spin_lock(&dlm->master_lock);
+ if (mle)
+ __dlm_put_mle(mle);
+ spin_unlock(&dlm->master_lock);
spin_unlock(&dlm->spinlock);
*ret_data = (void *)res;
dlm_put(dlm);
_
Patches currently in -mm which might be from alex.chen@xxxxxxxxxx are
ocfs2-dlm-should-put-mle-when-goto-kill-in-dlm_assert_master_handler.patch
ocfs2-dlm-refactor-error-handling-in-dlm_alloc_ctxt.patch
ocfs2-fix-shift-left-operations-overflow.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
