Skip to content

Commit 966120b

Browse files
old-memoriesaxboe
authored andcommitted
ublk_drv: check ubq_daemon_is_dying() in __ublk_rq_task_work()
Replace direct check on PF_EXITING in __ublk_rq_task_work() by the existing wrapper. Also inline ubq_daemon_is_dying(). Reviewed-by: Ming Lei <[email protected]> Signed-off-by: ZiyangZhang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 92cb6e2 commit 966120b

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/block/ublk_drv.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ static inline struct ublk_uring_cmd_pdu *ublk_get_uring_cmd_pdu(
555555
return (struct ublk_uring_cmd_pdu *)&ioucmd->pdu;
556556
}
557557

558-
static bool ubq_daemon_is_dying(struct ublk_queue *ubq)
558+
static inline bool ubq_daemon_is_dying(struct ublk_queue *ubq)
559559
{
560560
return ubq->ubq_daemon->flags & PF_EXITING;
561561
}
@@ -644,8 +644,7 @@ static inline void __ublk_rq_task_work(struct request *req)
644644
struct ublk_device *ub = ubq->dev;
645645
int tag = req->tag;
646646
struct ublk_io *io = &ubq->ios[tag];
647-
bool task_exiting = current != ubq->ubq_daemon ||
648-
(current->flags & PF_EXITING);
647+
bool task_exiting = current != ubq->ubq_daemon || ubq_daemon_is_dying(ubq);
649648
unsigned int mapped_bytes;
650649

651650
pr_devel("%s: complete: op %d, qid %d tag %d io_flags %x addr %llx\n",

0 commit comments

Comments
 (0)