From: Yu Kuai yukuai3@huawei.com
hulk inclusion category: bugfix bugzilla: NA CVE: NA
-------------------------------------------------
QUEUE_FLAG_RQ_ALLOC_TIME and QUEUE_FLAG_SCSI_PASSTHROUGH are both defined to 27.
Fixes: 07b4948adaf9 ("blk-mq: add optional request->alloc_time_ns") Signed-off-by: Yu Kuai yukuai3@huawei.com Reviewed-by: Yufen Yu yuyufen@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- include/linux/blkdev.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index de83f2f96ec87..1ce80e23eeab1 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -725,8 +725,8 @@ struct request_queue { #define QUEUE_FLAG_REGISTERED 26 /* queue has been registered to a disk */ #define QUEUE_FLAG_SCSI_PASSTHROUGH 27 /* queue supports SCSI commands */ #define QUEUE_FLAG_QUIESCED 28 /* queue has been quiesced */ -#define QUEUE_FLAG_RQ_ALLOC_TIME 27 /* record rq->alloc_time_ns */ -#define QUEUE_FLAG_FORECE_QUIESCE 29 /* force quiesce when cleanup queue */ +#define QUEUE_FLAG_FORECE_QUIESCE 29 /* force quiesce when cleanup queue */ +#define QUEUE_FLAG_RQ_ALLOC_TIME 30 /* record rq->alloc_time_ns */
#define QUEUE_FLAG_DEFAULT ((1 << QUEUE_FLAG_IO_STAT) | \ (1 << QUEUE_FLAG_SAME_COMP) | \