From: Heinz Mauelshagen <heinzm@redhat.com>
Date: Fri, 22 Feb 2019 19:00:01 +0000 (+0100)
Subject: null_blk: fix checking for REQ_FUA
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bf7c7a04014678c6880642936e3d420cdfe453bc;p=openwrt%2Fstaging%2Fblogic.git

null_blk: fix checking for REQ_FUA

null_handle_bio() erroneously uses the bio_op macro
which masks respective request flag bits including REQ_FUA
out thus failing the check.

Fix by checking bio->bi_opf directly.

Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index 83c38a6217d7..417a9f15c116 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -1104,7 +1104,7 @@ static int null_handle_bio(struct nullb_cmd *cmd)
 		len = bvec.bv_len;
 		err = null_transfer(nullb, bvec.bv_page, len, bvec.bv_offset,
 				     op_is_write(bio_op(bio)), sector,
-				     bio_op(bio) & REQ_FUA);
+				     bio->bi_opf & REQ_FUA);
 		if (err) {
 			spin_unlock_irq(&nullb->lock);
 			return err;