Received: by 2002:ac0:b08d:0:0:0:0:0 with SMTP id l13csp1778322imc; Fri, 22 Feb 2019 11:00:46 -0800 (PST) X-Google-Smtp-Source: AHgI3IaUzqgeNVX0xwnmC+gBWkVBDcG7oF92tbExVrJel1g82jgyN/susrCxxH8OruZ3U1O/94Rc X-Received: by 2002:a63:4924:: with SMTP id w36mr1924474pga.227.1550862046212; Fri, 22 Feb 2019 11:00:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550862046; cv=none; d=google.com; s=arc-20160816; b=J1mjtRbPkzISrcbL9NoP5sD3NxTnFNbdhBaYRx5C9iuGfAiGSYU6figCoI3lN5JQfI Au9sdh73WHUtwDSxuXbuDhKq/rBpBZooMgq1dLCmWB3EhAbHffE+V7vTeQ5NdL2BofN9 4kTiCLLSTwypX0T8jbnX1TjKwUKEG1x1ez2ETVvLXU7BqHrUn2kWGLwP6YH5V93ni5+z oKTmiT6OwLAymalmVLp7UUquRDTMJ63dyAZWuYB1xO7SBtR1kaIV6+adhjNWq2M23Nn+ Z9EDjEzXmCocURmVZvYz0eh3EpUco8LOv0HW1hEd/7cqXBgKelzv94PiIGeDOih48R0x Hxtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=dNTXTa/fy4rPXJCn94Jfwu0Pmk7vWQZjHnPdfnlOQiY=; b=Zt4t8pqes/IB+02hB5uor6R2wZzobIWEGQwNl6sKeIWXndwRczyHTM+xupdBYYCcpO 5bCsk4pYNYrKG8bGDy4lADvSCij6T/Y5ftgL4tSzG4AtyFn9uK5sHN7RD8cg97TjoiTU TssFwxA7/3sA9JF9axFBAWAoC5JtnDgYHfl8P4eZbLZ/Riuz/PCYRH4fK/MAMUGYDR04 EZZCRN6rmiulQuxPt/wFt9QA+5Lv0fSsy11iqHeGKG/4UzmbdCv/iVlyWfXBuMUeD1bE ei56OBJRAq2lgIfiSDoKnTRwpqV0kI6/KNPsQuVp9xzd6mt4z5rQwlER03ikGkS8TjOK Ik5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f21si1918700plr.104.2019.02.22.11.00.30; Fri, 22 Feb 2019 11:00:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726086AbfBVTAH (ORCPT + 99 others); Fri, 22 Feb 2019 14:00:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52430 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725767AbfBVTAH (ORCPT ); Fri, 22 Feb 2019 14:00:07 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DAFC03007E53; Fri, 22 Feb 2019 19:00:06 +0000 (UTC) Received: from o.ww.redhat.com (ovpn-117-19.ams2.redhat.com [10.36.117.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EEC467676; Fri, 22 Feb 2019 19:00:02 +0000 (UTC) From: Heinz Mauelshagen To: heinzm@redhat.com, axboe@kernel.dk Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH] null_blk: fix checking for REQ_FUA Date: Fri, 22 Feb 2019 20:00:01 +0100 Message-Id: <154589c8c1b22879dfc03aec4555793329d5ce83.1550861849.git.heinzm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 22 Feb 2019 19:00:07 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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