2016-03-07 12:02:39

by Eric Engestrom

Subject: [PATCH] md/bitmap: remove redundant check

daemon_sleep is an unsigned, so testing if it's 0 or less than 1 does
the same thing.

Signed-off-by: Eric Engestrom <[email protected]>
---
drivers/md/bitmap.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index d80cce4..bbe7b64 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -510,8 +510,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap)
sb->chunksize = cpu_to_le32(chunksize);

daemon_sleep = bitmap->mddev->bitmap_info.daemon_sleep;
- if (!daemon_sleep ||
- (daemon_sleep < 1) || (daemon_sleep > MAX_SCHEDULE_TIMEOUT)) {
+ if (!daemon_sleep || (daemon_sleep > MAX_SCHEDULE_TIMEOUT)) {
printk(KERN_INFO "Choosing daemon_sleep default (5 sec)\n");
daemon_sleep = 5 * HZ;
}
--
2.7.1

2016-03-07 17:26:32

by Shaohua Li

Subject: Re: [PATCH] md/bitmap: remove redundant check

On Mon, Mar 07, 2016 at 12:01:05PM +0000, Eric Engestrom wrote:
> daemon_sleep is an unsigned, so testing if it's 0 or less than 1 does
> the same thing.
>
> Signed-off-by: Eric Engestrom <[email protected]>
> ---
> drivers/md/bitmap.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
> index d80cce4..bbe7b64 100644
> --- a/drivers/md/bitmap.c
> +++ b/drivers/md/bitmap.c
> @@ -510,8 +510,7 @@ static int bitmap_new_disk_sb(struct bitmap *bitmap)
> sb->chunksize = cpu_to_le32(chunksize);
>
> daemon_sleep = bitmap->mddev->bitmap_info.daemon_sleep;
> - if (!daemon_sleep ||
> - (daemon_sleep < 1) || (daemon_sleep > MAX_SCHEDULE_TIMEOUT)) {
> + if (!daemon_sleep || (daemon_sleep > MAX_SCHEDULE_TIMEOUT)) {
> printk(KERN_INFO "Choosing daemon_sleep default (5 sec)\n");
> daemon_sleep = 5 * HZ;
> }

Applied, thanks!