The patch titled Subject: ocfs2/dlm: clean up unused variable in dlm_process_recovery_data has been added to the -mm tree. Its filename is ocfs2-dlm-clean-up-unused-variable-in-dlm_process_recovery_data.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-dlm-clean-up-unused-variable-in-dlm_process_recovery_data.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-dlm-clean-up-unused-variable-in-dlm_process_recovery_data.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: ocfs2/dlm: clean up unused variable in dlm_process_recovery_data Link: http://lkml.kernel.org/r/1522734135-7933-1-git-send-email-ge.changwei@xxxxxxx Signed-off-by: Changwei Ge <ge.changwei@xxxxxxx> Acked-by: Joseph Qi <jiangqi903@xxxxxxxxx> Cc: Mark Fasheh <mark@xxxxxxxxxx> 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 | 4 ---- 1 file changed, 4 deletions(-) diff -puN fs/ocfs2/dlm/dlmrecovery.c~ocfs2-dlm-clean-up-unused-variable-in-dlm_process_recovery_data fs/ocfs2/dlm/dlmrecovery.c --- a/fs/ocfs2/dlm/dlmrecovery.c~ocfs2-dlm-clean-up-unused-variable-in-dlm_process_recovery_data +++ a/fs/ocfs2/dlm/dlmrecovery.c @@ -1823,7 +1823,6 @@ static int dlm_process_recovery_data(str int i, j, bad; struct dlm_lock *lock; u8 from = O2NM_MAX_NODES; - unsigned int added = 0; __be64 c; mlog(0, "running %d locks for this lockres\n", mres->num_locks); @@ -1839,7 +1838,6 @@ static int dlm_process_recovery_data(str spin_lock(&res->spinlock); dlm_lockres_set_refmap_bit(dlm, res, from); spin_unlock(&res->spinlock); - added++; break; } BUG_ON(ml->highest_blocked != LKM_IVMODE); @@ -1927,7 +1925,6 @@ static int dlm_process_recovery_data(str /* do not alter lock refcount. switching lists. */ list_move_tail(&lock->list, queue); spin_unlock(&res->spinlock); - added++; mlog(0, "just reordered a local lock!\n"); continue; @@ -2053,7 +2050,6 @@ skip_lvb: "setting refmap bit\n", dlm->name, res->lockname.len, res->lockname.name, ml->node); dlm_lockres_set_refmap_bit(dlm, res, ml->node); - added++; } spin_unlock(&res->spinlock); } _ 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 ocfs2-dlm-clean-up-unused-argument-for-dlm_destroy_recovery_area.patch ocfs2-dlm-clean-up-unused-stack-variable-in-dlm_do_local_ast.patch ocfs2-correct-spelling-mistake-for-migratable-for-all.patch ocfs2-dlm-clean-up-unused-variable-in-dlm_process_recovery_data.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