Commit 0f225f87 authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

null_blk: Delete nullb.{queue_depth, nr_queues} 



Since commit 8b631f9c ("null_blk: remove the bio based I/O path"),
struct nullb members queue_depth and nr_queues are only ever written, so
delete them.

With that, null_exit_hctx() can also be deleted.

Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20240222083420.6026-1-john.g.garry@oracle.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 40685508

drivers/block/null_blk/main.c

+0 −11
Original line number Diff line number Diff line
@@ -1620,14 +1620,6 @@ static void null_queue_rqs(struct request **rqlist) 
	*rqlist = requeue_list;

}



static void null_exit_hctx(struct blk_mq_hw_ctx *hctx, unsigned int hctx_idx)

{

	struct nullb_queue *nq = hctx->driver_data;

	struct nullb *nullb = nq->dev->nullb;



	nullb->nr_queues--;

}



static void null_init_queue(struct nullb *nullb, struct nullb_queue *nq)

{

	nq->dev = nullb->dev;
@@ -1647,7 +1639,6 @@ static int null_init_hctx(struct blk_mq_hw_ctx *hctx, void *driver_data, 
	nq = &nullb->queues[hctx_idx];

	hctx->driver_data = nq;

	null_init_queue(nullb, nq);

	nullb->nr_queues++;



	return 0;

}
@@ -1660,7 +1651,6 @@ static const struct blk_mq_ops null_mq_ops = { 
	.poll		= null_poll,

	.map_queues	= null_map_queues,

	.init_hctx	= null_init_hctx,

	.exit_hctx	= null_exit_hctx,

};



static void null_del_dev(struct nullb *nullb)
@@ -1731,7 +1721,6 @@ static int setup_queues(struct nullb *nullb) 
	if (!nullb->queues)

		return -ENOMEM;



	nullb->queue_depth = nullb->dev->hw_queue_depth;

	return 0;

}

drivers/block/null_blk/null_blk.h

+0 −2
Original line number Diff line number Diff line
@@ -114,14 +114,12 @@ struct nullb { 
	struct gendisk *disk;

	struct blk_mq_tag_set *tag_set;

	struct blk_mq_tag_set __tag_set;

	unsigned int queue_depth;

	atomic_long_t cur_bytes;

	struct hrtimer bw_timer;

	unsigned long cache_flush_pos;

	spinlock_t lock;



	struct nullb_queue *queues;

	unsigned int nr_queues;

	char disk_name[DISK_NAME_LEN];

};