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>

10 files changed, 7 insertions, 11 deletions

diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index 697d6213c82b..c39247c5ddb6 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -249,7 +249,6 @@ static const char *const alloc_policy_name[] = {
 static const char *const hctx_flag_name[] = {
         HCTX_FLAG_NAME(SHOULD_MERGE),
         HCTX_FLAG_NAME(TAG_SHARED),
-        HCTX_FLAG_NAME(SG_MERGE),
         HCTX_FLAG_NAME(BLOCKING),
         HCTX_FLAG_NAME(NO_SCHED),
 };
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 8ef583197414..3d63ad036398 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1937,7 +1937,7 @@ static int loop_add(struct loop_device **l, int i)
         lo->tag_set.queue_depth = 128;
         lo->tag_set.numa_node = NUMA_NO_NODE;
         lo->tag_set.cmd_size = sizeof(struct loop_cmd);
-        lo->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_SG_MERGE;
+        lo->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
         lo->tag_set.driver_data = lo;
 
         err = blk_mq_alloc_tag_set(&lo->tag_set);
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 7c9a949e876b..32a7ba1674b7 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1571,7 +1571,7 @@ static int nbd_dev_add(int index)
         nbd->tag_set.numa_node = NUMA_NO_NODE;
         nbd->tag_set.cmd_size = sizeof(struct nbd_cmd);
         nbd->tag_set.flags = BLK_MQ_F_SHOULD_MERGE |
-                BLK_MQ_F_SG_MERGE | BLK_MQ_F_BLOCKING;
+                BLK_MQ_F_BLOCKING;
         nbd->tag_set.driver_data = nbd;
 
         err = blk_mq_alloc_tag_set(&nbd->tag_set);
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 1e92b61d0bd5..abe9e1c89227 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3988,7 +3988,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
         rbd_dev->tag_set.ops = &rbd_mq_ops;
         rbd_dev->tag_set.queue_depth = rbd_dev->opts->queue_depth;
         rbd_dev->tag_set.numa_node = NUMA_NO_NODE;
-        rbd_dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_SG_MERGE;
+        rbd_dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
         rbd_dev->tag_set.nr_hw_queues = 1;
         rbd_dev->tag_set.cmd_size = sizeof(struct work_struct);
 
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);
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 0ed4b200fa58..d43a5677ccbc 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -977,7 +977,7 @@ static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size,
         } else
                 info->tag_set.queue_depth = BLK_RING_SIZE(info);
         info->tag_set.numa_node = NUMA_NO_NODE;
-        info->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_SG_MERGE;
+        info->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
         info->tag_set.cmd_size = sizeof(struct blkif_req);
         info->tag_set.driver_data = info;
 
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
index 4eb5f8c56535..b2f8eb2365ee 100644
--- a/drivers/md/dm-rq.c
+++ b/drivers/md/dm-rq.c
@@ -527,7 +527,7 @@ int dm_mq_init_request_queue(struct mapped_device *md, struct dm_table *t)
         md->tag_set->ops = &dm_mq_ops;
         md->tag_set->queue_depth = dm_get_blk_mq_queue_depth();
         md->tag_set->numa_node = md->numa_node_id;
-        md->tag_set->flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_SG_MERGE;
+        md->tag_set->flags = BLK_MQ_F_SHOULD_MERGE;
         md->tag_set->nr_hw_queues = dm_get_blk_mq_nr_hw_queues();
         md->tag_set->driver_data = md;
 
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;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 6d65ac584eba..6cadbe945bdb 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1899,7 +1899,7 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost)
         shost->tag_set.queue_depth = shost->can_queue;
         shost->tag_set.cmd_size = cmd_size;
         shost->tag_set.numa_node = NUMA_NO_NODE;
-        shost->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_SG_MERGE;
+        shost->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
         shost->tag_set.flags |=
                 BLK_ALLOC_POLICY_TO_MQ_FLAG(shost->hostt->tag_alloc_policy);
         shost->tag_set.driver_data = shost;
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 0e030f5f76b6..b0c814bcc7e3 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -218,7 +218,6 @@ struct blk_mq_ops {
 enum {
         BLK_MQ_F_SHOULD_MERGE   = 1 << 0,
         BLK_MQ_F_TAG_SHARED     = 1 << 1,
-        BLK_MQ_F_SG_MERGE       = 1 << 2,
         BLK_MQ_F_BLOCKING       = 1 << 5,
         BLK_MQ_F_NO_SCHED       = 1 << 6,
         BLK_MQ_F_ALLOC_POLICY_START_BIT = 8,