The patch titled Subject: ocfs2/dlm: return zero if deref_done message is successfully handled has been added to the -mm tree. Its filename is ocfs2-dlm-return-zero-if-deref_done-message-is-successfully-handled.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-dlm-return-zero-if-deref_done-message-is-successfully-handled.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-dlm-return-zero-if-deref_done-message-is-successfully-handled.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: xuejiufei <xuejiufei@xxxxxxxxxx> Subject: ocfs2/dlm: return zero if deref_done message is successfully handled dlm_deref_lockres_done_handler() should return zero if the message is successfully handled. Fixes: 60d663cb5273 ("ocfs2/dlm: add DEREF_DONE message"). Signed-off-by: xuejiufei <xuejiufei@xxxxxxxxxx> Reviewed-by: Joseph Qi <joseph.qi@xxxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/dlm/dlmmaster.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN fs/ocfs2/dlm/dlmmaster.c~ocfs2-dlm-return-zero-if-deref_done-message-is-successfully-handled fs/ocfs2/dlm/dlmmaster.c --- a/fs/ocfs2/dlm/dlmmaster.c~ocfs2-dlm-return-zero-if-deref_done-message-is-successfully-handled +++ a/fs/ocfs2/dlm/dlmmaster.c @@ -2455,6 +2455,8 @@ int dlm_deref_lockres_done_handler(struc spin_unlock(&dlm->spinlock); + ret = 0; + done: dlm_put(dlm); return ret; _ Patches currently in -mm which might be from xuejiufei@xxxxxxxxxx are ocfs2-dlm-return-zero-if-deref_done-message-is-successfully-handled.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