Commit 736b005b authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

ublk: remove __ublk_quiesce_dev() 



Remove __ublk_quiesce_dev() and open code for updating device state as
QUIESCED.

We needn't to drain inflight requests in __ublk_quiesce_dev() any more,
because all inflight requests are aborted in ublk char device release
handler.

Also we needn't to set ->canceling in __ublk_quiesce_dev() any more
because it is done unconditionally now in ublk_ch_release().

Reviewed-by: default avatarUday Shankar <ushankar@purestorage.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20250416035444.99569-7-ming.lei@redhat.com


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

drivers/block/ublk_drv.c

+2 −17
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ struct ublk_params_header { 


static void ublk_stop_dev_unlocked(struct ublk_device *ub);

static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ubq);

static void __ublk_quiesce_dev(struct ublk_device *ub);

static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub,

		struct ublk_queue *ubq, int tag, size_t offset);

static inline unsigned int ublk_req_build_flags(struct request *req);
@@ -1586,7 +1585,8 @@ static int ublk_ch_release(struct inode *inode, struct file *filp) 
		ublk_stop_dev_unlocked(ub);

	} else {

		if (ublk_nosrv_dev_should_queue_io(ub)) {

			__ublk_quiesce_dev(ub);

			/* ->canceling is set and all requests are aborted */

			ub->dev_info.state = UBLK_S_DEV_QUIESCED;

		} else {

			ub->dev_info.state = UBLK_S_DEV_FAIL_IO;

			for (i = 0; i < ub->dev_info.nr_hw_queues; i++)
@@ -1832,21 +1832,6 @@ static void ublk_wait_tagset_rqs_idle(struct ublk_device *ub) 
	}

}



static void __ublk_quiesce_dev(struct ublk_device *ub)

{

	int i;



	pr_devel("%s: quiesce ub: dev_id %d state %s\n",

			__func__, ub->dev_info.dev_id,

			ub->dev_info.state == UBLK_S_DEV_LIVE ?

			"LIVE" : "QUIESCED");

	/* mark every queue as canceling */

	for (i = 0; i < ub->dev_info.nr_hw_queues; i++)

		ublk_get_queue(ub, i)->canceling = true;

	ublk_wait_tagset_rqs_idle(ub);

	ub->dev_info.state = UBLK_S_DEV_QUIESCED;

}



static void ublk_force_abort_dev(struct ublk_device *ub)

{

	int i;