From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2A1234D385; Wed, 9 Sep 2026 06:10:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788934226; cv=none; b=gPqizk6oRYSMycKcWEmPBkOKobEDmLqRrFVA+QfVNpVpTg2ubjhnB7gptHBpiqH7/QLKY0FHIzmeK08h/cf5v+9oeWVbppHWYR2ciEG0IvkACG0il9jX9YBjAMW4jvzzMkZ/zErwkMnJi1VXz3WiPt40KqxPyUgYHMcdxDfkiQo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788934226; c=relaxed/simple; bh=/iAdtMCZuaygYqDJHGT+xzjU+1AoEkGRpc+DUy6AkwE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=opLd48c3jEPF3g9TbvvMuHPgDUF4E+xPf/Lc48v6qAc8ozzJNlPSJkbXSYuNz67HK5g8ipBTGHJeYic8HXRwu5ZWfsR5nFv3H8j4hgnwtWQgZj9p5FnXNETjGZRI6wczNk5crKPjLIW/HE0bJtQgf4OLlPJQrjYhRBZofPZhGIA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=VmgpxL0g; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="VmgpxL0g" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=qeoqb1wAPG712TnEW1dhLUkUFZuBYwIhKfxHtaR9s4A=; b=VmgpxL0gDATfK8KZSs3Qb844fa D+jQeiEOhCe8q+nScgmMpP8gN7yI+w++7/WRIH5ZxWkyQuA7LnNvrn5TgMd0QBnHbKOgbqXg6cbDI Rr/hlprOI7bFBe2iQz642SRBFI9PcwHWkpdy63tZ6Tq02kjmB+EvItAhk047HsjiNrvc7K9TQtvYE cO3HxoUGTocVjf6d3F/ABgWrLMmcAi0YyyZUumb5XzO6Oa/mIUohI12GeWAuzHo6E0xaBlokr5khy 69GwoN6WEKPFBPtYWOUW4/LkBZBfncj7JBv8eBeJFasFT0CPaNwBd+A9rwXlxU4yatsn/lilEqvlF wTWUX2Jg==; Received: from [62.74.3.53] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.99.1 #2 (Red Hat Linux)) id 1x4BVn-0000000AqjC-09WE; Wed, 09 Sep 2026 06:10:23 +0000 From: Christoph Hellwig To: Jens Axboe , Christian Brauner , "Darrick J. Wong" , Carlos Maiolino Cc: Tal Zussman , Anuj Gupta , linux-block@vger.kernel.org, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 08/16] xfs: move PI generation into xfs_submit_zoned_bio Date: Wed, 9 Sep 2026 09:08:57 +0300 Message-ID: <20260909060924.1102037-9-hch@lst.de> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260909060924.1102037-1-hch@lst.de> References: <20260909060924.1102037-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Keep the code in one place. Signed-off-by: Christoph Hellwig --- fs/xfs/xfs_aops.c | 4 +--- fs/xfs/xfs_file.c | 2 -- fs/xfs/xfs_zone_alloc.c | 4 ++++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 4e862406eee9..d2cdb7cffa6b 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c @@ -23,7 +23,6 @@ #include "xfs_ioend.h" #include "xfs_zone_alloc.h" #include "xfs_rtgroup.h" -#include struct xfs_writepage_ctx { struct iomap_writepage_ctx ctx; @@ -498,8 +497,7 @@ xfs_zoned_writeback_submit( bio_endio(&ioend->io_bio); return error; } - if (ioend->io_flags & IOMAP_IOEND_INTEGRITY) - fs_bio_integrity_generate(&ioend->io_bio); + xfs_zone_alloc_and_submit(ioend, &XFS_ZWPC(wpc)->open_zone); return 0; } diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index acbfd55f56a3..0e029db2e85b 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -739,8 +739,6 @@ xfs_dio_zoned_submit_io( bio->bi_end_io = xfs_end_bio; ioend = iomap_init_ioend(iter->inode, bio, file_offset, iomap_ioend_flags(&iter->iomap) | IOMAP_IOEND_DIRECT); - if (ioend->io_flags & IOMAP_IOEND_INTEGRITY) - fs_bio_integrity_generate(bio); xfs_zone_alloc_and_submit(ioend, &ac->open_zone); } diff --git a/fs/xfs/xfs_zone_alloc.c b/fs/xfs/xfs_zone_alloc.c index bdbb60cc5d5b..bede79859671 100644 --- a/fs/xfs/xfs_zone_alloc.c +++ b/fs/xfs/xfs_zone_alloc.c @@ -26,6 +26,7 @@ #include "xfs_zones.h" #include "xfs_trace.h" #include "xfs_mru_cache.h" +#include static void xfs_open_zone_free_rcu( @@ -909,6 +910,9 @@ xfs_zone_alloc_and_submit( if (xfs_is_shutdown(mp)) goto out_error; + if (ioend->io_flags & IOMAP_IOEND_INTEGRITY) + fs_bio_integrity_generate(&ioend->io_bio); + /* * If we don't have a locally cached zone in this write context, see if * the inode is still associated with a zone and use that if so. -- 2.53.0