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/block/skd_main.c | |
| parent | 2705c93742e91730d335838025d75d8043861174 (diff) | |
| download | linux-56d18f62f556b80105e38e7975975cf7465aae3e.tar.bz2 | |
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/block/skd_main.c')
| -rw-r--r-- | drivers/block/skd_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c index ab893a7571a2..7d3ad6c22ee5 100644 --- a/drivers/block/skd_main.c +++ b/drivers/block/skd_main.c @@ -2843,7 +2843,6 @@ static int skd_cons_disk(struct skd_device *skdev) skdev->sgs_per_request * sizeof(struct scatterlist); skdev->tag_set.numa_node = NUMA_NO_NODE; skdev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | - BLK_MQ_F_SG_MERGE | BLK_ALLOC_POLICY_TO_MQ_FLAG(BLK_TAG_ALLOC_FIFO); skdev->tag_set.driver_data = skdev; rc = blk_mq_alloc_tag_set(&skdev->tag_set); |