The patch titled Subject: fs/ocfs2/dlm/dlmrecovery.c: remove unrelated comment has been added to the -mm tree. Its filename is ocfs2-dlm-clean-unrelated-comment.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-dlm-clean-unrelated-comment.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-dlm-clean-unrelated-comment.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/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Changwei Ge <ge.changwei@xxxxxxx> Subject: fs/ocfs2/dlm/dlmrecovery.c: remove unrelated comment Obviously, the comment before dlm_do_local_recovery_cleanup() has nothing to do with it. So remove it. Link: http://lkml.kernel.org/r/1519371054-4648-1-git-send-email-ge.changwei@xxxxxxx Signed-off-by: Changwei Ge <ge.changwei@xxxxxxx> Acked-by: Joseph Qi <jiangqi903@xxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Cc: Junxiao Bi <junxiao.bi@xxxxxxxxxx> Cc: Changwei Ge <ge.changwei@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/dlm/dlmrecovery.c | 7 ------- 1 file changed, 7 deletions(-) diff -puN fs/ocfs2/dlm/dlmrecovery.c~ocfs2-dlm-clean-unrelated-comment fs/ocfs2/dlm/dlmrecovery.c --- a/fs/ocfs2/dlm/dlmrecovery.c~ocfs2-dlm-clean-unrelated-comment +++ a/fs/ocfs2/dlm/dlmrecovery.c @@ -2340,13 +2340,6 @@ static void dlm_free_dead_locks(struct d __dlm_dirty_lockres(dlm, res); } -/* if this node is the recovery master, and there are no - * locks for a given lockres owned by this node that are in - * either PR or EX mode, zero out the lvb before requesting. - * - */ - - static void dlm_do_local_recovery_cleanup(struct dlm_ctxt *dlm, u8 dead_node) { struct dlm_lock_resource *res; _ Patches currently in -mm which might be from ge.changwei@xxxxxxx are ocfs2-clean-up-two-unused-functions-in-suballocc.patch ocfs2-dlm-clean-unrelated-comment.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