diff options
| author | Bart Van Assche <bart.vanassche@wdc.com> | 2018-03-07 17:10:03 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-03-08 14:13:48 -0700 |
| commit | f78bac2c8e69144781e271d9771bae8dbb4e7098 (patch) | |
| tree | 6897788655ef507c7a0c158fde32e2d15dadf539 /block/blk-mq.c | |
| parent | 66f91322f39cd18a01524264464c2ff4c98c936e (diff) | |
| download | linux-0-day-f78bac2c8e69144781e271d9771bae8dbb4e7098.tar.gz linux-0-day-f78bac2c8e69144781e271d9771bae8dbb4e7098.tar.xz | |
block: Use the queue_flag_*() functions instead of open-coding these
Except for changing the atomic queue flag manipulations that are
protected by the queue lock into non-atomic manipulations, this
patch does not change any functionality.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 75336848f7a78..e70cc7d48f582 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2678,7 +2678,7 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, q->queue_flags |= QUEUE_FLAG_MQ_DEFAULT; if (!(set->flags & BLK_MQ_F_SG_MERGE)) - q->queue_flags |= 1 << QUEUE_FLAG_NO_SG_MERGE; + queue_flag_set_unlocked(QUEUE_FLAG_NO_SG_MERGE, q); q->sg_reserved_size = INT_MAX; |