summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2024-03-06 21:15:24 +0300
committerJens Axboe <axboe@kernel.dk>2024-03-06 21:15:24 +0300
commitd37977f0af365586d2b3efb8beb1935aa9116694 (patch)
treea6396174d03a3026673d59df0e78a31abff6b826 /block
parent34a2cf3fbef17deee2d4d28c41e3cb8ac1929fda (diff)
parentdd27a84b06aa9ea6a94b0f3e59dc768f981962e1 (diff)
downloadlinux-d37977f0af365586d2b3efb8beb1935aa9116694.tar.xz
Merge tag 'md-6.9-20240306' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-6.9/block
Pull MD atomic queue limits changes from Song. * tag 'md-6.9-20240306' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md: block: remove disk_stack_limits md: remove mddev->queue md: don't initialize queue limits md/raid10: use the atomic queue limit update APIs md/raid5: use the atomic queue limit update APIs md/raid1: use the atomic queue limit update APIs md/raid0: use the atomic queue limit update APIs md: add queue limit helpers md: add a mddev_is_dm helper md: add a mddev_add_trace_msg helper md: add a mddev_trace_remap helper
Diffstat (limited to 'block')
-rw-r--r--block/blk-settings.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c
index 13865a9f8972..3c7d8d638ab5 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -917,30 +917,6 @@ void queue_limits_stack_bdev(struct queue_limits *t, struct block_device *bdev,
EXPORT_SYMBOL_GPL(queue_limits_stack_bdev);
/**
- * disk_stack_limits - adjust queue limits for stacked drivers
- * @disk: MD/DM gendisk (top)
- * @bdev: the underlying block device (bottom)
- * @offset: offset to beginning of data within component device
- *
- * Description:
- * Merges the limits for a top level gendisk and a bottom level
- * block_device.
- */
-void disk_stack_limits(struct gendisk *disk, struct block_device *bdev,
- sector_t offset)
-{
- struct request_queue *t = disk->queue;
-
- if (blk_stack_limits(&t->limits, &bdev_get_queue(bdev)->limits,
- get_start_sect(bdev) + (offset >> 9)) < 0)
- pr_notice("%s: Warning: Device %pg is misaligned\n",
- disk->disk_name, bdev);
-
- disk_update_readahead(disk);
-}
-EXPORT_SYMBOL(disk_stack_limits);
-
-/**
* blk_queue_update_dma_pad - update pad mask
* @q: the request queue for the device
* @mask: pad mask