Skip to content

Commit 58c898b

Browse files
Ming Leiaxboe
authored andcommitted
block: add helper for checking if queue is registered
There are 4 users which check if queue is registered, so add one helper to check it. Cc: Christoph Hellwig <[email protected]> Cc: Hannes Reinecke <[email protected]> Cc: Greg KH <[email protected]> Cc: Mike Snitzer <[email protected]> Cc: Bart Van Assche <[email protected]> Reviewed-by: Bart Van Assche <[email protected]> Signed-off-by: Ming Lei <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent c6ba933 commit 58c898b

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

block/blk-sysfs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@ int blk_register_queue(struct gendisk *disk)
942942
if (WARN_ON(!q))
943943
return -ENXIO;
944944

945-
WARN_ONCE(test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags),
945+
WARN_ONCE(blk_queue_registered(q),
946946
"%s is registering an already registered queue\n",
947947
kobject_name(&dev->kobj));
948948
blk_queue_flag_set(QUEUE_FLAG_REGISTERED, q);
@@ -1026,7 +1026,7 @@ void blk_unregister_queue(struct gendisk *disk)
10261026
return;
10271027

10281028
/* Return early if disk->queue was never registered. */
1029-
if (!test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags))
1029+
if (!blk_queue_registered(q))
10301030
return;
10311031

10321032
/*

block/blk-wbt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ void wbt_enable_default(struct request_queue *q)
656656
return;
657657

658658
/* Queue not registered? Maybe shutting down... */
659-
if (!test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags))
659+
if (!blk_queue_registered(q))
660660
return;
661661

662662
if (queue_is_mq(q) && IS_ENABLED(CONFIG_BLK_WBT_MQ))

block/elevator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ static int __elevator_change(struct request_queue *q, const char *name)
656656
struct elevator_type *e;
657657

658658
/* Make sure queue is not in the middle of being removed */
659-
if (!test_bit(QUEUE_FLAG_REGISTERED, &q->queue_flags))
659+
if (!blk_queue_registered(q))
660660
return -ENOENT;
661661

662662
/*

include/linux/blkdev.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q);
643643
#define blk_queue_quiesced(q) test_bit(QUEUE_FLAG_QUIESCED, &(q)->queue_flags)
644644
#define blk_queue_pm_only(q) atomic_read(&(q)->pm_only)
645645
#define blk_queue_fua(q) test_bit(QUEUE_FLAG_FUA, &(q)->queue_flags)
646+
#define blk_queue_registered(q) test_bit(QUEUE_FLAG_REGISTERED, &(q)->queue_flags)
646647

647648
extern void blk_set_pm_only(struct request_queue *q);
648649
extern void blk_clear_pm_only(struct request_queue *q);

0 commit comments

Comments
 (0)