Commit 56d18f62 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2705c937

block/blk-mq-debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -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),

};

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/block/nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/block/rbd.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/block/skd_main.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE