Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4721374iob; Sun, 8 May 2022 23:14:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4QA0gZS6yGezRiUeSNdaIjJBzbG9AwHNgP9wc4++mVlox93wK28piJoreIYdHPF7MrRLf X-Received: by 2002:a17:902:f28b:b0:15c:5c21:dc15 with SMTP id k11-20020a170902f28b00b0015c5c21dc15mr14977879plc.16.1652076842100; Sun, 08 May 2022 23:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652076842; cv=none; d=google.com; s=arc-20160816; b=Zo1mZ8QjxMP3P9uVVga74lvbLo6Yny1GCbwD1WSbxl2YObFrYWQG/aBSh3/3thMmbs XPj2hBckZNErqWX/5HyYej23gBNLJsmiczbFYYlojIS/zAMlrOqiQj9xm5OUxxo0creE QcBBKGCS0bqyoSw+lENgBekjhSI+EJcIyRGzbk/FU6EFhAWu7tLsL/5L6jGF430nWhRf +G6d9BqnM/qJcFFzfEKCCqHpjfrFgjCVhtdEoAYQzHh6MJapFe1D+TIT6PWjiiP+g38i gJdPtYuinIWItErc+2HLeCGEitt5bUk2vAzoG0Pjz6DccugkUgHTnJK+IKR/5KEPhhr+ yFoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RtCQlpyeZzrkml/ipagATZXeeWC5nkcgQ0+awyets+0=; b=zTCn4vbARy1UYtAbboDpvLm95INCn1x83DxfZHS7zub8wjbxCfRQcz/bthAjLgsigG aM987rq1MrhQAmG+0Ler2QGOPEHTNzSc/HYUeMugLPGkfENcvsWCQqlLkWky9LC9cI7f 8RpNdgYdPSkKK1J6JUzirrgxo7F5r220NobuX18IfH//U/GL6WOFsGCKetGpvJPxu8kw i9BseSBMLH543p815at6cJWJu1qrVxN8k9bncVddVPlOei6mDSa/zOLyNCLd6T6pqza/ 5qe2RVi9SS8pFu5ySYsbU15hNSgYjkqNE2S+inT3Q3s8cbdiJBuCIgkEzx24g86+oldJ /UeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=womKuCWy; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id d8-20020a656b88000000b003ab211aa308si12312858pgw.726.2022.05.08.23.14.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 23:14:02 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=womKuCWy; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9C35016A271; Sun, 8 May 2022 23:13:26 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359670AbiEDRtk (ORCPT + 99 others); Wed, 4 May 2022 13:49:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357711AbiEDRPM (ORCPT ); Wed, 4 May 2022 13:15:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B35C4C78F; Wed, 4 May 2022 09:58:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 666BB61770; Wed, 4 May 2022 16:58:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3A4CC385B0; Wed, 4 May 2022 16:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683534; bh=uApf3v+9kesqtJgfXozi9r+RG/9L8H2PAKWXC7sppRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=womKuCWyVAHDoom+6bd6XQuccus/Zui99EhHwGpadZ+wwMFPu/HttxVOEM9hERlK5 Q7+dYEBVy0BEFD0v0I/80O2B/dMT6qnf4zFyWVbXnDbJMF88PSwPhTW8i2FzBtJi0X P6RpJXg1vf4EYS9hFFE9SLc3D7mBdrwRNUwyhJnA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Naohiro Aota , Qu Wenruo , Sweet Tea Dorminy , Christoph Hellwig , David Sterba Subject: [PATCH 5.17 192/225] btrfs: fix direct I/O writes for split bios on zoned devices Date: Wed, 4 May 2022 18:47:10 +0200 Message-Id: <20220504153127.384584893@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Hellwig commit 0fdf977d4576ee0decd612e22f6a837a239573cc upstream. When a bio is split in btrfs_submit_direct, dip->file_offset contains the file offset for the first bio. But this means the start value used in btrfs_end_dio_bio to record the write location for zone devices is incorrect for subsequent bios. CC: stable@vger.kernel.org # 5.16+ Reviewed-by: Johannes Thumshirn Reviewed-by: Naohiro Aota Reviewed-by: Qu Wenruo Reviewed-by: Sweet Tea Dorminy Signed-off-by: Christoph Hellwig Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/inode.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7845,6 +7845,7 @@ static blk_status_t btrfs_submit_bio_sta static void btrfs_end_dio_bio(struct bio *bio) { struct btrfs_dio_private *dip = bio->bi_private; + struct btrfs_bio *bbio = btrfs_bio(bio); blk_status_t err = bio->bi_status; if (err) @@ -7855,12 +7856,12 @@ static void btrfs_end_dio_bio(struct bio bio->bi_iter.bi_size, err); if (bio_op(bio) == REQ_OP_READ) - err = btrfs_check_read_dio_bio(dip, btrfs_bio(bio), !err); + err = btrfs_check_read_dio_bio(dip, bbio, !err); if (err) dip->dio_bio->bi_status = err; - btrfs_record_physical_zoned(dip->inode, dip->file_offset, bio); + btrfs_record_physical_zoned(dip->inode, bbio->file_offset, bio); bio_put(bio); btrfs_dio_private_put(dip);