OSDN Git Service

md: Simplify code with existing definition RESYNC_SECTORS in raid10.c
authorZhen Lei <thunder.leizhen@huawei.com>
Fri, 21 Aug 2020 01:29:18 +0000 (09:29 +0800)
committerSong Liu <songliubraving@fb.com>
Thu, 24 Sep 2020 23:44:45 +0000 (16:44 -0700)
#define RESYNC_SECTORS (RESYNC_BLOCK_SIZE >> 9)

"RESYNC_BLOCK_SIZE/512" is equal to "RESYNC_BLOCK_SIZE >> 9", replace it
with RESYNC_SECTORS.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
drivers/md/raid10.c

index 5d1bdee..3b598a3 100644 (file)
@@ -4458,8 +4458,8 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,
                last = conf->reshape_progress - 1;
                sector_nr = last & ~(sector_t)(conf->geo.chunk_mask
                                               & conf->prev.chunk_mask);
-               if (sector_nr + RESYNC_BLOCK_SIZE/512 < last)
-                       sector_nr = last + 1 - RESYNC_BLOCK_SIZE/512;
+               if (sector_nr + RESYNC_SECTORS < last)
+                       sector_nr = last + 1 - RESYNC_SECTORS;
        } else {
                /* 'next' is after the last device address that we
                 * might write to for this chunk in the new layout
@@ -4481,8 +4481,8 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr,
                last  = sector_nr | (conf->geo.chunk_mask
                                     & conf->prev.chunk_mask);
 
-               if (sector_nr + RESYNC_BLOCK_SIZE/512 <= last)
-                       last = sector_nr + RESYNC_BLOCK_SIZE/512 - 1;
+               if (sector_nr + RESYNC_SECTORS <= last)
+                       last = sector_nr + RESYNC_SECTORS - 1;
        }
 
        if (need_flush ||