From: Yu Kuai <yuku...@huawei.com>
This case can be handled without knowing internal implementation.
Prepare to introduce CONFIG_MD_BITMAP.
Signed-off-by: Yu Kuai <yuku...@huawei.com>
---
drivers/md/md-bitmap.c | 4 ----
drivers/md/md-bitmap.h | 11 +++++++++++
drivers/md/raid1.c | 6 +++---
drivers/md/raid10.c | 8 +++-----
drivers/md/raid5.c | 4 ++--
5 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c
index 33f952c78397..a92e3c52bfcf 100644
--- a/drivers/md/md-bitmap.c
+++ b/drivers/md/md-bitmap.c
@@ -1820,10 +1820,6 @@ static void __bitmap_end_sync(struct bitmap *bitmap,
sector_t offset,
bitmap_counter_t *bmc;
unsigned long flags;
- if (bitmap == NULL) {
- *blocks = 1024;
- return;
- }
spin_lock_irqsave(&bitmap->counts.lock, flags);
bmc = md_bitmap_get_counter(&bitmap->counts, offset, blocks, 0);
if (bmc == NULL)
diff --git a/drivers/md/md-bitmap.h b/drivers/md/md-bitmap.h
index 6a5806ebb11a..fefa00bc438e 100644
--- a/drivers/md/md-bitmap.h
+++ b/drivers/md/md-bitmap.h
@@ -145,4 +145,15 @@ static inline bool md_bitmap_start_sync(struct mddev
*mddev, sector_t offset,
return mddev->bitmap_ops->start_sync(mddev, offset, blocks, degraded);
}
+static inline void md_bitmap_end_sync(struct mddev *mddev, sector_t offset,
+ sector_t *blocks)
+{
+ if (!md_bitmap_enabled(mddev)) {
+ *blocks = 1024;
+ return;
+ }
+
+ mddev->bitmap_ops->end_sync(mddev, offset, blocks);
+}
+
#endif
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index f6943849f34a..a94f71e79783 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2060,7 +2060,7 @@ static void abort_sync_write(struct mddev *mddev, struct
r1bio *r1_bio)
/* make sure these bits don't get cleared. */
do {
- mddev->bitmap_ops->end_sync(mddev, s, &sync_blocks);
+ md_bitmap_end_sync(mddev, s, &sync_blocks);
s += sync_blocks;
sectors_to_go -= sync_blocks;
} while (sectors_to_go > 0);
@@ -2802,8 +2802,8 @@ static sector_t raid1_sync_request(struct mddev *mddev,
sector_t sector_nr,
* We can find the current addess in mddev->curr_resync
*/
if (mddev->curr_resync < max_sector) /* aborted */
- mddev->bitmap_ops->end_sync(mddev, mddev->curr_resync,
- &sync_blocks);
+ md_bitmap_end_sync(mddev, mddev->curr_resync,
+ &sync_blocks);
else /* completed sync */
conf->fullsync = 0;
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index ca594d56f8d0..f448b5d9faf3 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3228,15 +3228,13 @@ static sector_t raid10_sync_request(struct mddev
*mddev, sector_t sector_nr,
if (mddev->curr_resync < max_sector) { /* aborted */
if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery))
- mddev->bitmap_ops->end_sync(mddev,
- mddev->curr_resync,
- &sync_blocks);
+ md_bitmap_end_sync(mddev, mddev->curr_resync,
+ &sync_blocks);
else for (i = 0; i < conf->geo.raid_disks; i++) {
sector_t sect =
raid10_find_virt(conf,
mddev->curr_resync, i);
- mddev->bitmap_ops->end_sync(mddev, sect,
- &sync_blocks);
+ md_bitmap_end_sync(mddev, sect, &sync_blocks);
}
} else {
/* completed sync */
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 5b825c196b56..9098762ccfa6 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -6501,8 +6501,8 @@ static inline sector_t raid5_sync_request(struct mddev
*mddev, sector_t sector_n
}
if (mddev->curr_resync < max_sector) /* aborted */
- mddev->bitmap_ops->end_sync(mddev, mddev->curr_resync,
- &sync_blocks);
+ md_bitmap_end_sync(mddev, mddev->curr_resync,
+ &sync_blocks);
else /* completed sync */
conf->fullsync = 0;
mddev->bitmap_ops->close_sync(mddev);
--
2.39.2
