diff options
author | Jens Axboe <axboe@kernel.dk> | 2024-06-14 10:22:08 -0600 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2024-06-14 10:22:08 -0600 |
commit | e3e72fe4cb1d1b7399fab0e98166b8bfcddb9ec7 (patch) | |
tree | 6dc1246757810cc0473ec5fda194395df9df9716 /drivers/md/raid5.c | |
parent | d37a9ab8331cfc0fc2eac0480f0af624c0144a92 (diff) | |
parent | c6e56cf6b2e79a463af21286ba951714ed20828c (diff) | |
download | linux-e3e72fe4cb1d1b7399fab0e98166b8bfcddb9ec7.tar.gz linux-e3e72fe4cb1d1b7399fab0e98166b8bfcddb9ec7.tar.bz2 linux-e3e72fe4cb1d1b7399fab0e98166b8bfcddb9ec7.zip |
Merge branch 'for-6.11/block-limits' into for-6.11/block
Pull in block limits branch, which exists as a shared branch for both
the block and SCSI tree.
* for-6.11/block-limits: (26 commits)
block: move integrity information into queue_limits
block: invert the BLK_INTEGRITY_{GENERATE,VERIFY} flags
block: bypass the STABLE_WRITES flag for protection information
block: don't require stable pages for non-PI metadata
block: use kstrtoul in flag_store
block: factor out flag_{store,show} helper for integrity
block: remove the blk_flush_integrity call in blk_integrity_unregister
block: remove the blk_integrity_profile structure
dm-integrity: use the nop integrity profile
md/raid1: don't free conf on raid0_run failure
md/raid0: don't free conf on raid0_run failure
block: initialize integrity buffer to zero before writing it to media
block: add special APIs for run-time disabling of discard and friends
block: remove unused queue limits API
sr: convert to the atomic queue limits API
sd: convert to the atomic queue limits API
sd: cleanup zoned queue limits initialization
sd: factor out a sd_discard_mode helper
sd: simplify the disable case in sd_config_discard
sd: add a sd_disable_write_same helper
...
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 547fd15115cd..c62c4122942a 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7712,7 +7712,7 @@ static int raid5_set_limits(struct mddev *mddev) lim.raid_partial_stripes_expensive = 1; lim.discard_granularity = stripe; lim.max_write_zeroes_sectors = 0; - mddev_stack_rdev_limits(mddev, &lim); + mddev_stack_rdev_limits(mddev, &lim, 0); rdev_for_each(rdev, mddev) queue_limits_stack_bdev(&lim, rdev->bdev, rdev->new_data_offset, mddev->gendisk->disk_name); |