diff options
| author | Ming Lei <ming.lei@redhat.com> | 2019-02-15 12:13:24 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-02-15 16:40:12 +0100 |
| commit | 56d18f62f556b80105e38e7975975cf7465aae3e (patch) | |
| tree | 84c773dfa354ba3c4af1fc06111cdcf1737c5dbc /drivers/block/nbd.c | |
| parent | block: kill QUEUE_FLAG_NO_SG_MERGE (diff) | |
| download | linux-56d18f62f556b80105e38e7975975cf7465aae3e.tar.xz linux-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/block/nbd.c')
| -rw-r--r-- | drivers/block/nbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |