summaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorHou Pu <houpu@bytedance.com>2020-08-21 04:34:42 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-03 11:24:23 +0200
commit515903c16bde320ba4c9fbce97944f1214d7a464 (patch)
treeb9dfcb89bf4867c5bc9975538d23bfe841e74530 /drivers/block
parent0ece300942e050e30300cf108d6c71f13c0e424e (diff)
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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/null_blk_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index d2d7dc9cd58d..4fef1fb918ec 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -1086,7 +1086,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;