summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaeseok Youn <daeseok.youn@gmail.com>2015-04-15 00:43:02 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-15 01:48:57 +0200
commit7a8346429d6da4039a4687a8a07f3f8cdaf96d92 (patch)
tree6f3a25fdef6b696c85239bf6cf64a153d5cb6dcf
parentocfs2: one function call less in user_cluster_connect() after error detection (diff)
downloadlinux-7a8346429d6da4039a4687a8a07f3f8cdaf96d92.tar.xz
linux-7a8346429d6da4039a4687a8a07f3f8cdaf96d92.zip
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@gmail.com> Cc: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/ocfs2/stack_o2cb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c
index 1724d43d3da1..220cae7bbdbc 100644
--- a/fs/ocfs2/stack_o2cb.c
+++ b/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);
}