From: Hou Pu <houpu@bytedance.com>
Date: Fri, 21 Aug 2020 08:34:42 +0000 (-0400)
Subject: null_blk: fix passing of REQ_FUA flag in null_handle_rq
X-Git-Tag: v4.14.196~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3146b3220c1b1c3f6b91d1f3a4bb234d51813114;p=thirdparty%2Fkernel%2Fstable.git

null_blk: fix passing of REQ_FUA flag in null_handle_rq

[ Upstream commit 2d62e6b038e729c3e4bfbfcfbd44800ef0883680 ]

REQ_FUA should be checked using rq->cmd_flags instead of req_op().

Fixes: deb78b419dfda ("nullb: emulate cache")
Signed-off-by: Hou Pu <houpu@bytedance.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index b12e373aa956a..ec670a1b7e02f 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -1135,7 +1135,7 @@ static int null_handle_rq(struct nullb_cmd *cmd)
 		len = bvec.bv_len;
 		err = null_transfer(nullb, bvec.bv_page, len, bvec.bv_offset,
 				     op_is_write(req_op(rq)), sector,
-				     req_op(rq) & REQ_FUA);
+				     rq->cmd_flags & REQ_FUA);
 		if (err) {
 			spin_unlock_irq(&nullb->lock);
 			return err;