2019-02-22 19:00:46

by Heinz Mauelshagen

Subject: [PATCH] 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 <[email protected]>
---
drivers/block/null_blk_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c
index 62c9654b9ce8..04b9d415511b 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;
--
2.20.1

2019-02-28 22:07:13

by Jens Axboe

Subject: Re: [PATCH] null_blk: fix checking for REQ_FUA

On 2/22/19 12:00 PM, Heinz Mauelshagen wrote:
> 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.

Thanks, applied.

--
Jens Axboe