2015-02-17 07:16:50

by Daeseok Youn

Subject: [PATCH 1/2] ocfs2: remove useless if statement

The Local variable "i" in for loop is always less then
O2CB_MAP_STABILIZE_COUNT.

Signed-off-by: Daeseok Youn <[email protected]>
---
fs/ocfs2/stack_o2cb.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c
index 1724d43..813d726 100644
--- a/fs/ocfs2/stack_o2cb.c
+++ b/fs/ocfs2/stack_o2cb.c
@@ -295,8 +295,8 @@ 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)
- msleep(1000);
+
+ msleep(1000);
}

printk(KERN_ERR "o2cb: This node could not connect to nodes:");
--
1.7.1

2015-02-17 23:30:59

by Andrew Morton

Subject: Re: [PATCH 1/2] ocfs2: remove useless if statement

On Tue, 17 Feb 2015 16:13:50 +0900 Daeseok Youn <[email protected]> wrote:

> The Local variable "i" in for loop is always less then
> O2CB_MAP_STABILIZE_COUNT.
>
> Signed-off-by: Daeseok Youn <[email protected]>
> ---
> fs/ocfs2/stack_o2cb.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/ocfs2/stack_o2cb.c b/fs/ocfs2/stack_o2cb.c
> index 1724d43..813d726 100644
> --- a/fs/ocfs2/stack_o2cb.c
> +++ b/fs/ocfs2/stack_o2cb.c
> @@ -295,8 +295,8 @@ 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)
> - msleep(1000);
> +
> + msleep(1000);
> }

I assume the code was intended to do

if (i < O2CB_MAP_STABILIZE_COUNT - 1)
msleep(1000);

to avoid a pointless 1-second delay when the operation times out.