The patch titled Subject: ocfs2: avoid a pointless delay in o2cb_cluster_check() has been added to the -mm tree. Its filename is ocfs2-avoid-a-pointless-delay-in-o2cb_cluster_check.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-avoid-a-pointless-delay-in-o2cb_cluster_check.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-avoid-a-pointless-delay-in-o2cb_cluster_check.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: Daeseok Youn <daeseok.youn@xxxxxxxxx> Subject: ocfs2: avoid a pointless delay in o2cb_cluster_check() Fix an off-by-one when attempting to avoid an msleep() on the final loop iteration. Signed-off-by: Daeseok Youn <daeseok.youn@xxxxxxxxx> Cc: Mark Fasheh <mfasheh@xxxxxxxx> Cc: Joel Becker <jlbec@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/ocfs2/stack_o2cb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/ocfs2/stack_o2cb.c~ocfs2-avoid-a-pointless-delay-in-o2cb_cluster_check fs/ocfs2/stack_o2cb.c --- a/fs/ocfs2/stack_o2cb.c~ocfs2-avoid-a-pointless-delay-in-o2cb_cluster_check +++ a/fs/ocfs2/stack_o2cb.c @@ -295,7 +295,7 @@ static int o2cb_cluster_check(void) set_bit(node_num, netmap); if (!memcmp(hbmap, netmap, sizeof(hbmap))) return 0; - if (i < O2CB_MAP_STABILIZE_COUNT) + if (i < O2CB_MAP_STABILIZE_COUNT - 1) msleep(1000); } _ Patches currently in -mm which might be from daeseok.youn@xxxxxxxxx are ocfs2-remove-unneeded-rc-for-kfree.patch ocfs2-avoid-a-pointless-delay-in-o2cb_cluster_check.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