summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Rettberg2020-07-16 11:38:16 +0200
committerSimon Rettberg2020-07-16 11:38:16 +0200
commit3937ead089b8e39a9120fab705ff0e79c7efeed5 (patch)
tree58dd5acbedbc44c600bbd03f25196b56cc8f6f8a /src
parentadded check for rid and discovery now takes bigger test block (diff)
downloaddnbd3-ng-3937ead089b8e39a9120fab705ff0e79c7efeed5.tar.gz
dnbd3-ng-3937ead089b8e39a9120fab705ff0e79c7efeed5.tar.xz
dnbd3-ng-3937ead089b8e39a9120fab705ff0e79c7efeed5.zip
[KERNEL] BLK_MQ_F_SG_MERGE removed in 5.1
Diffstat (limited to 'src')
-rw-r--r--src/kernel/core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/kernel/core.c b/src/kernel/core.c
index ef41158..35ea1ef 100644
--- a/src/kernel/core.c
+++ b/src/kernel/core.c
@@ -285,12 +285,10 @@ int dnbd3_add_device(struct dnbd3_device *dev, int minor)
* nbd has this flags set (ther is no documentation)
* BLK_MQ_F_SHOULD_MERGE: Reverse check our software queue for entries
* that we could potentially merge with
- * BLK_MQ_F_SG_MERGE: If SG merging is disabled, each bio vector is
- * a segment.
* BLK_MQ_F_BLOCKING: Wait for rcu if blocking, else wait for rcu in
* each queue.
*/
- dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE | BLK_MQ_F_SG_MERGE;
+ dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
// | BLK_MQ_F_BLOCKING;
dev->tag_set.driver_data = dev;