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:26:55 +0200
commit2fc8fa50ebeebeb42c5e4fb7655ec3a1296f262f (patch)
tree48b1c2316de5742c828b999f1cc1b8a93c4b595e /drivers/block
parent88994acafd96dbb9f07d293e60b882b7f1654702 (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 c4454cfc6d53..13eae973eaea 100644
--- a/drivers/block/null_blk_main.c
+++ b/drivers/block/null_blk_main.c
@@ -1072,7 +1072,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;