Skip to content

Commit e6d1300

Browse files
committed
Merge branch 'for-6.11/block' into for-next
* for-6.11/block: block: fix the blk_queue_nonrot polarity
2 parents c15ffe9 + 4434887 commit e6d1300

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/blkdev.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ bool blk_queue_flag_test_and_set(unsigned int flag, struct request_queue *q);
617617
#define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags)
618618
#define blk_queue_noxmerges(q) \
619619
test_bit(QUEUE_FLAG_NOXMERGES, &(q)->queue_flags)
620-
#define blk_queue_nonrot(q) ((q)->limits.features & BLK_FEAT_ROTATIONAL)
620+
#define blk_queue_nonrot(q) (!((q)->limits.features & BLK_FEAT_ROTATIONAL))
621621
#define blk_queue_io_stat(q) ((q)->limits.features & BLK_FEAT_IO_STAT)
622622
#define blk_queue_zone_resetall(q) \
623623
((q)->limits.features & BLK_FEAT_ZONE_RESETALL)

0 commit comments

Comments
 (0)