ublk: merge stop_work and quiesce_work

Save some lines by merging stop_work and quiesce_work into nosrv_work,
which looks at the recovery flags and does the right thing when the "no
ublk server" condition is detected.

Signed-off-by: Uday Shankar <ushankar@purestorage.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20241007182419.3263186-4-ushankar@purestorage.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index 50eb608b98a40b99b0a10cf59d8b76052e7bac8a..0e75283e3bdae0cda9b89bc4f372243e95502053 100644 (file)
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -182,8 +182,7 @@ struct ublk_device {
        unsigned int            nr_queues_ready;
        unsigned int            nr_privileged_daemon;
 
-       struct work_struct      quiesce_work;
-       struct work_struct      stop_work;
+       struct work_struct      nosrv_work;
 };
 
 /* header of ublk_params */
@@ -1261,10 +1260,7 @@ static enum blk_eh_timer_return ublk_timeout(struct request *rq)
                struct ublk_device *ub = ubq->dev;
 
                if (ublk_abort_requests(ub, ubq)) {
-                       if (ublk_nosrv_should_stop_dev(ub))
-                               schedule_work(&ub->stop_work);
-                       else
-                               schedule_work(&ub->quiesce_work);
+                       schedule_work(&ub->nosrv_work);
                }
                return BLK_EH_DONE;
        }
@@ -1514,10 +1510,7 @@ static void ublk_uring_cmd_cancel_fn(struct io_uring_cmd *cmd,
        ublk_cancel_cmd(ubq, io, issue_flags);
 
        if (need_schedule) {
-               if (ublk_nosrv_should_stop_dev(ub))
-                       schedule_work(&ub->stop_work);
-               else
-                       schedule_work(&ub->quiesce_work);
+               schedule_work(&ub->nosrv_work);
        }
 }
 
@@ -1580,20 +1573,6 @@ static void __ublk_quiesce_dev(struct ublk_device *ub)
        ub->dev_info.state = UBLK_S_DEV_QUIESCED;
 }
 
-static void ublk_quiesce_work_fn(struct work_struct *work)
-{
-       struct ublk_device *ub =
-               container_of(work, struct ublk_device, quiesce_work);
-
-       mutex_lock(&ub->mutex);
-       if (ub->dev_info.state != UBLK_S_DEV_LIVE)
-               goto unlock;
-       __ublk_quiesce_dev(ub);
- unlock:
-       mutex_unlock(&ub->mutex);
-       ublk_cancel_dev(ub);
-}
-
 static void ublk_unquiesce_dev(struct ublk_device *ub)
 {
        int i;
@@ -1642,6 +1621,25 @@ static void ublk_stop_dev(struct ublk_device *ub)
        ublk_cancel_dev(ub);
 }
 
+static void ublk_nosrv_work(struct work_struct *work)
+{
+       struct ublk_device *ub =
+               container_of(work, struct ublk_device, nosrv_work);
+
+       if (ublk_nosrv_should_stop_dev(ub)) {
+               ublk_stop_dev(ub);
+               return;
+       }
+
+       mutex_lock(&ub->mutex);
+       if (ub->dev_info.state != UBLK_S_DEV_LIVE)
+               goto unlock;
+       __ublk_quiesce_dev(ub);
+ unlock:
+       mutex_unlock(&ub->mutex);
+       ublk_cancel_dev(ub);
+}
+
 /* device can only be started after all IOs are ready */
 static void ublk_mark_io_ready(struct ublk_device *ub, struct ublk_queue *ubq)
 {
@@ -2155,14 +2153,6 @@ static int ublk_add_chdev(struct ublk_device *ub)
        return ret;
 }
 
-static void ublk_stop_work_fn(struct work_struct *work)
-{
-       struct ublk_device *ub =
-               container_of(work, struct ublk_device, stop_work);
-
-       ublk_stop_dev(ub);
-}
-
 /* align max io buffer size with PAGE_SIZE */
 static void ublk_align_max_io_size(struct ublk_device *ub)
 {
@@ -2187,8 +2177,7 @@ static int ublk_add_tag_set(struct ublk_device *ub)
 static void ublk_remove(struct ublk_device *ub)
 {
        ublk_stop_dev(ub);
-       cancel_work_sync(&ub->stop_work);
-       cancel_work_sync(&ub->quiesce_work);
+       cancel_work_sync(&ub->nosrv_work);
        cdev_device_del(&ub->cdev, &ub->cdev_dev);
        ublk_put_device(ub);
        ublks_added--;
@@ -2457,8 +2446,7 @@ static int ublk_ctrl_add_dev(struct io_uring_cmd *cmd)
                goto out_unlock;
        mutex_init(&ub->mutex);
        spin_lock_init(&ub->lock);
-       INIT_WORK(&ub->quiesce_work, ublk_quiesce_work_fn);
-       INIT_WORK(&ub->stop_work, ublk_stop_work_fn);
+       INIT_WORK(&ub->nosrv_work, ublk_nosrv_work);
 
        ret = ublk_alloc_dev_number(ub, header->dev_id);
        if (ret < 0)
@@ -2593,9 +2581,7 @@ static inline void ublk_ctrl_cmd_dump(struct io_uring_cmd *cmd)
 static int ublk_ctrl_stop_dev(struct ublk_device *ub)
 {
        ublk_stop_dev(ub);
-       cancel_work_sync(&ub->stop_work);
-       cancel_work_sync(&ub->quiesce_work);
-
+       cancel_work_sync(&ub->nosrv_work);
        return 0;
 }