Commit b9b1a5d7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove blk_queue_stack_limits 



This function is just a tiny wrapper around blk_stack_limits.  Open code
it int the two callers.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Tested-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9efa82ef

block/blk-settings.c

+0 −11
Original line number Diff line number Diff line
@@ -455,17 +455,6 @@ void blk_queue_io_opt(struct request_queue *q, unsigned int opt) 
}

EXPORT_SYMBOL(blk_queue_io_opt);



/**

 * blk_queue_stack_limits - inherit underlying queue limits for stacked drivers

 * @t:	the stacking driver (top)

 * @b:  the underlying device (bottom)

 **/

void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b)

{

	blk_stack_limits(&t->limits, &b->limits, 0);

}

EXPORT_SYMBOL(blk_queue_stack_limits);



/**

 * blk_stack_limits - adjust queue_limits for stacked devices

 * @t:	the stacking driver limits (top device)

drivers/block/drbd/drbd_nl.c

+2 −2
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ static void fixup_discard_if_not_supported(struct request_queue *q) 


static void fixup_write_zeroes(struct drbd_device *device, struct request_queue *q)

{

	/* Fixup max_write_zeroes_sectors after blk_queue_stack_limits():

	/* Fixup max_write_zeroes_sectors after blk_stack_limits():

	 * if we can handle "zeroes" efficiently on the protocol,

	 * we want to do that, even if our backend does not announce

	 * max_write_zeroes_sectors itself. */
@@ -1361,7 +1361,7 @@ static void drbd_setup_queue_param(struct drbd_device *device, struct drbd_backi 
	decide_on_write_same_support(device, q, b, o, disable_write_same);



	if (b) {

		blk_queue_stack_limits(q, b);

		blk_stack_limits(&q->limits, &b->limits, 0);



		if (q->backing_dev_info->ra_pages !=

		    b->backing_dev_info->ra_pages) {

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -2054,7 +2054,8 @@ static int __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id) 
#ifdef CONFIG_NVME_MULTIPATH

	if (ns->head->disk) {

		nvme_update_disk_info(ns->head->disk, ns, id);

		blk_queue_stack_limits(ns->head->disk->queue, ns->queue);

		blk_stack_limits(&ns->head->disk->queue->limits,

				 &ns->queue->limits, 0);

		nvme_mpath_update_disk_size(ns->head->disk);

	}

#endif

include/linux/blkdev.h

+0 −1
Original line number Diff line number Diff line
@@ -1141,7 +1141,6 @@ extern int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 
			    sector_t offset);

extern void disk_stack_limits(struct gendisk *disk, struct block_device *bdev,

			      sector_t offset);

extern void blk_queue_stack_limits(struct request_queue *t, struct request_queue *b);

extern void blk_queue_update_dma_pad(struct request_queue *, unsigned int);

extern void blk_queue_segment_boundary(struct request_queue *, unsigned long);

extern void blk_queue_virt_boundary(struct request_queue *, unsigned long);