diff options
| author | Yu Kuai <[email protected]> | 2024-08-26 07:44:44 +0000 |
|---|---|---|
| committer | Song Liu <[email protected]> | 2024-08-27 19:43:15 +0000 |
| commit | e1791dae6cbd65e5102dca40b8adadef1d89c1b9 (patch) | |
| tree | eac6979de71f17227293294a49bd1e0fb9dd0e39 /drivers/md/raid5.c | |
| parent | md/md-bitmap: merge md_bitmap_daemon_work() into bitmap_operations (diff) | |
| download | kernel-e1791dae6cbd65e5102dca40b8adadef1d89c1b9.tar.gz kernel-e1791dae6cbd65e5102dca40b8adadef1d89c1b9.zip | |
md/md-bitmap: pass in mddev directly for md_bitmap_resize()
And move the condition "if (mddev->bitmap)" into md_bitmap_resize() as
well, on the one hand make code cleaner, on the other hand try not to
access bitmap directly.
Since we are here, also change the parameter 'init' from int to bool.
Signed-off-by: Yu Kuai <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Song Liu <[email protected]>
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 91b610d11c6a..47c89f7b1dfe 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -8313,6 +8313,7 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors) */ sector_t newsize; struct r5conf *conf = mddev->private; + int ret; if (raid5_has_log(conf) || raid5_has_ppl(conf)) return -EINVAL; @@ -8321,11 +8322,11 @@ static int raid5_resize(struct mddev *mddev, sector_t sectors) if (mddev->external_size && mddev->array_sectors > newsize) return -EINVAL; - if (mddev->bitmap) { - int ret = md_bitmap_resize(mddev->bitmap, sectors, 0, 0); - if (ret) - return ret; - } + + ret = md_bitmap_resize(mddev, sectors, 0, false); + if (ret) + return ret; + md_set_array_sectors(mddev, newsize); if (sectors > mddev->dev_sectors && mddev->recovery_cp > mddev->dev_sectors) { |