summaryrefslogtreecommitdiffstats
path: root/module/zfs/zvol.c
diff options
context:
space:
mode:
authorChunwei Chen <[email protected]>2016-07-27 17:55:32 +0000
committerBrian Behlendorf <[email protected]>2016-07-29 14:48:19 -0700
commit3b86aeb2952c91aeb8ed0ebf9d5e43119fa537a0 (patch)
tree37b94f2a75deb3e22ca75f050c23c67b9e7b82f1 /module/zfs/zvol.c
parent76e5f6fe10ab8c9c8ae13e4c33ecb68f3d0ce5dc (diff)
Linux 4.8 compat: REQ_OP and bio_set_op_attrs()
New REQ_OP_* definitions have been introduced to separate the WRITE, READ, and DISCARD operations from the flags. This included changing the encoding of bi_rw. It places REQ_OP_* in high order bits and other stuff in low order bits. This encoding is done through the new helper function bio_set_op_attrs. For complete details refer to: https://github.com/torvalds/linux/commit/f215082 https://github.com/torvalds/linux/commit/4e1b2d5 Signed-off-by: Tim Chase <[email protected]> Signed-off-by: Chunwei Chen <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #4892 Closes #4899
Diffstat (limited to 'module/zfs/zvol.c')
-rw-r--r--module/zfs/zvol.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
index 73277901f..c25b243db 100644
--- a/module/zfs/zvol.c
+++ b/module/zfs/zvol.c
@@ -812,7 +812,7 @@ zvol_request(struct request_queue *q, struct bio *bio)
goto out2;
}
- if (bio->bi_rw & VDEV_REQ_DISCARD) {
+ if (bio_is_discard(bio)) {
error = zvol_discard(bio);
goto out2;
}