Message ID | 20170809154727.2085-3-hch@lst.de (mailing list archive) |
---|---|
State | Not Applicable, archived |
Delegated to: | Mike Snitzer |
Headers | show
Return-Path: <dm-devel-bounces@redhat.com> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 59752601EB for <patchwork-dm-devel@patchwork.kernel.org>; Wed, 9 Aug 2017 16:09:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 439BC2821F for <patchwork-dm-devel@patchwork.kernel.org>; Wed, 9 Aug 2017 16:09:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3855B283AD; Wed, 9 Aug 2017 16:09:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD1B12821F for <patchwork-dm-devel@patchwork.kernel.org>; Wed, 9 Aug 2017 16:09:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 99CEDCF743; Wed, 9 Aug 2017 16:09:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 99CEDCF743 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=dm-devel-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 99CEDCF743 Authentication-Results: mx1.redhat.com; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="GlbRjG8I" Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 73CFE91B01; Wed, 9 Aug 2017 16:09:05 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3C38D180B467; Wed, 9 Aug 2017 16:09:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v79G8qsK024337 for <dm-devel@listman.util.phx.redhat.com>; Wed, 9 Aug 2017 12:08:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id D4EFE84779; Wed, 9 Aug 2017 16:08:52 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54AD684773; Wed, 9 Aug 2017 16:08:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CAD66366E3C; Wed, 9 Aug 2017 16:08:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CAD66366E3C Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=none smtp.mailfrom=BATV+eb4e61afd325b22435ea+5099+infradead.org+hch@bombadil.srs.infradead.org DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com CAD66366E3C DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=bKPpIJY1CPR2KzlIluxRkcA2TlHrPNrYohQsXgFy5tA=; b=GlbRjG8IskzdAmYYwtzZ6lWFx e36y8Pbtz4Z5y88e8gBkKvJxXCJhYgoOUfngiI/vemtqqKyHB71/4nNX5h4tVN0v90xgl7ahokpNy q8ZzSpnIABGS9aVky83ZmAtYFPnzh9uSQLyVS/TIZGwj8pZe/lu0I/haYm516gH3vmID6uZLk+Q7M kEbL0ca8zhf03lYnobRh6BfddCU5ie1pN//nVu6GSM/7DXD5YXu82F7drFJ82vTaDi9zEIRgSl040 /jGpmE97GOksFCFkWiTF/CQ6nQlfnhMMDkzQ9gkp/li+hTA65j7ErsfmxsKPQDLyGkDOdSwePFux+ +PzqUB/aA==; Received: from clnet-p099-196.ikbnet.co.at ([83.175.99.196] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dfTCr-0003GU-VO; Wed, 09 Aug 2017 15:47:38 +0000 From: Christoph Hellwig <hch@lst.de> To: axboe@kernel.dk Date: Wed, 9 Aug 2017 17:47:27 +0200 Message-Id: <20170809154727.2085-3-hch@lst.de> In-Reply-To: <20170809154727.2085-1-hch@lst.de> References: <20170809154727.2085-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from <hch@infradead.org> by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Greylist: Delayed for 00:21:10 by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 09 Aug 2017 16:08:45 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 09 Aug 2017 16:08:45 +0000 (UTC) for IP:'65.50.211.133' DOMAIN:'bombadil.infradead.org' HELO:'bombadil.infradead.org' FROM:'BATV+eb4e61afd325b22435ea+5099+infradead.org+hch@bombadil.srs.infradead.org' RCPT:'' X-RedHat-Spam-Score: -0.01 (DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD) 65.50.211.133 bombadil.infradead.org 65.50.211.133 bombadil.infradead.org <BATV+eb4e61afd325b22435ea+5099+infradead.org+hch@bombadil.srs.infradead.org> X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: dm-devel@redhat.com Cc: linux-block@vger.kernel.org, dm-devel@redhat.com, mpatocka@redhat.com, gmazyland@gmail.com, martin.petersen@oracle.com Subject: [dm-devel] [PATCH 2/2] bio-integrity: only verify integrity on the lowest stacked driver X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development <dm-devel.redhat.com> List-Unsubscribe: <https://www.redhat.com/mailman/options/dm-devel>, <mailto:dm-devel-request@redhat.com?subject=unsubscribe> List-Archive: <https://www.redhat.com/archives/dm-devel> List-Post: <mailto:dm-devel@redhat.com> List-Help: <mailto:dm-devel-request@redhat.com?subject=help> List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>, <mailto:dm-devel-request@redhat.com?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 09 Aug 2017 16:09:06 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/block/bio-integrity.c b/block/bio-integrity.c index dcfb968c8259..9b1ea478577b 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -388,11 +388,10 @@ static void bio_integrity_verify_fn(struct work_struct *work) bool __bio_integrity_endio(struct bio *bio) { struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev); + struct bio_integrity_payload *bip = bio_integrity(bio); if (bio_op(bio) == REQ_OP_READ && !bio->bi_status && - bi->profile->verify_fn) - struct bio_integrity_payload *bip = bio_integrity(bio); - + (bip->bip_flags & BIP_BLOCK_INTEGRITY) && bi->profile->verify_fn) { INIT_WORK(&bip->bip_work, bio_integrity_verify_fn); queue_work(kintegrityd_wq, &bip->bip_work); return false;
This gets us back to the behavior in 4.12 and earlier. Signed-off-by: Christoph Hellwig <hch@lst.de> Fixes: 7c20f116 ("bio-integrity: stop abusing bi_end_io") --- block/bio-integrity.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)