diff options
author | Ming Lei <ming.lei@redhat.com> | 2019-02-15 19:13:24 +0800 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-02-15 08:40:12 -0700 |
commit | 56d18f62f556b80105e38e7975975cf7465aae3e (patch) | |
tree | 84c773dfa354ba3c4af1fc06111cdcf1737c5dbc /drivers/mmc | |
parent | 2705c93742e91730d335838025d75d8043861174 (diff) | |
download | linux-stable-56d18f62f556b80105e38e7975975cf7465aae3e.tar.gz linux-stable-56d18f62f556b80105e38e7975975cf7465aae3e.tar.bz2 linux-stable-56d18f62f556b80105e38e7975975cf7465aae3e.zip |
block: kill BLK_MQ_F_SG_MERGE
QUEUE_FLAG_NO_SG_MERGE has been killed, so kill BLK_MQ_F_SG_MERGE too.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/core/queue.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 35cc138b096d..cc19e71c71d4 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -410,8 +410,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card) else mq->tag_set.queue_depth = MMC_QUEUE_DEPTH; mq->tag_set.numa_node = NUMA_NO_NODE; - mq->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_SG_MERGE | - BLK_MQ_F_BLOCKING; + mq->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_BLOCKING; mq->tag_set.nr_hw_queues = 1; mq->tag_set.cmd_size = sizeof(struct mmc_queue_req); mq->tag_set.driver_data = mq; |