From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0BE853A451A; Tue, 31 Mar 2026 17:26:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774978017; cv=none; b=lOE8Y3pTx98bwSPHUiHknOsP7DX7Y2rwBdtgImI6Q/sSP41qmzKSyRllax1i1EeXKwPCfSJnVMWl5qSCzO9YvrWgBTa2gWgFcZVOtwKQwc9ppmp7I6Ke1z0zzPcwjNQGQ/Re9097233rNhM4DR85gz7ZJuSKW5rGb0x82CRdJAI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774978017; c=relaxed/simple; bh=+eQcaLkEY/cpQYP25ufYNu01bV9RFma7IVxnAqNmKvc=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=Ahs7XiQtO9ClFurNgSshTmFzOJpQd0G5S9ydbhIUDc2KThXd2uNAEoCOPEZ64DysfrucjpU+PU7N+K2y7B9mGjdpaYG9iuCoXYloh8kPrAFqqVmScEsMNrFZTBl3sQyKXcsL++sEsMUeOCPJJDMIPfDg0/F1OgSdQC3XCCZbEEg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vRBagZRz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="vRBagZRz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E122DC19423; Tue, 31 Mar 2026 17:26:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774978016; bh=+eQcaLkEY/cpQYP25ufYNu01bV9RFma7IVxnAqNmKvc=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=vRBagZRzKaJLxFYbLUU3SCKkN95fgqyd2o1t4UbzrOtXd01NLOF3+UDvoHbkSAMpd ZVJek4ZJDn9YresRko++IKaydscI31GG/sw2dKHLcic8mErSUAIJ8LsLIPgSRGNC9l EfTW5wXfHRt62NsoJx+mwoecoQA2IIgxmI+qDej9heK1F7PtE5dtjPiwhScrDnSFoq unsE3H42Z+uqo7D10PdXHdIuWSFHanJvKpfilJ/NilaKH2eWx7yQP6kETHzHM3FK6Z X9qE/Mk6DY9gkLB07kudzJPYIVgbRvDf8FsxA7Q9o6n0tdh03oStQF8r61Je3oVyYu B5vmQ6YL5dj4Q== Message-ID: Subject: Re: [PATCH 3/4] exportfs: don't pass struct iattr to ->commit_blocks From: Jeff Layton To: Christoph Hellwig , Chuck Lever , Amir Goldstein Cc: NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org Date: Tue, 31 Mar 2026 13:26:53 -0400 In-Reply-To: <20260331153406.4049290-4-hch@lst.de> References: <20260331153406.4049290-1-hch@lst.de> <20260331153406.4049290-4-hch@lst.de> Autocrypt: addr=jlayton@kernel.org; prefer-encrypt=mutual; keydata=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 QZIQXVeAA+smfTT0tDrisj1U5x6ZB9b3nBg65kc= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.58.3 (3.58.3-1.fc43) Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Tue, 2026-03-31 at 17:33 +0200, Christoph Hellwig wrote: > The only thing ->commit_blocks really needs is the new size, with a magic > -1 placeholder 0 for "do not change the size" because it only ever > extends the size. >=20 > Signed-off-by: Christoph Hellwig > --- > fs/nfsd/blocklayout.c | 12 ++---------- > fs/xfs/xfs_pnfs.c | 19 ++++++++++--------- > include/linux/exportfs_block.h | 3 +-- > 3 files changed, 13 insertions(+), 21 deletions(-) >=20 > diff --git a/fs/nfsd/blocklayout.c b/fs/nfsd/blocklayout.c > index 3cc3b47361e2..23c0e4d0ff34 100644 > --- a/fs/nfsd/blocklayout.c > +++ b/fs/nfsd/blocklayout.c > @@ -179,7 +179,6 @@ static __be32 > nfsd4_block_commit_blocks(struct inode *inode, struct nfsd4_layoutcommit= *lcp, > struct iomap *iomaps, int nr_iomaps) > { > - struct iattr iattr =3D { .ia_valid =3D 0 }; > int error; > =20 > /* > @@ -191,16 +190,9 @@ nfsd4_block_commit_blocks(struct inode *inode, struc= t nfsd4_layoutcommit *lcp, > * timestamp is a "may" condition, and clients that want to force a > * specific timestamp should send a separate SETATTR in the compound. > */ > - iattr.ia_valid |=3D ATTR_ATIME | ATTR_CTIME | ATTR_MTIME; > - iattr.ia_atime =3D iattr.ia_ctime =3D iattr.ia_mtime =3D current_time(i= node); > - > - if (lcp->lc_size_chg) { > - iattr.ia_valid |=3D ATTR_SIZE; > - iattr.ia_size =3D lcp->lc_newsize; > - } > - > error =3D inode->i_sb->s_export_op->block_ops->commit_blocks(inode, > - iomaps, nr_iomaps, &iattr); > + iomaps, nr_iomaps, > + lcp->lc_size_chg ? lcp->lc_newsize : 0);=20 > kfree(iomaps); > return nfserrno(error); > } > diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c > index a52978f6fb76..fee782a3edbe 100644 > --- a/fs/xfs/xfs_pnfs.c > +++ b/fs/xfs/xfs_pnfs.c > @@ -257,23 +257,22 @@ xfs_fs_commit_blocks( > struct inode *inode, > struct iomap *maps, > int nr_maps, > - struct iattr *iattr) > + loff_t new_size) > { > struct xfs_inode *ip =3D XFS_I(inode); > struct xfs_mount *mp =3D ip->i_mount; > struct xfs_trans *tp; > + struct timespec64 now; > bool update_isize =3D false; > int error, i; > loff_t size; > =20 > - ASSERT(iattr->ia_valid & (ATTR_ATIME|ATTR_CTIME|ATTR_MTIME)); > - > xfs_ilock(ip, XFS_IOLOCK_EXCL); > =20 > size =3D i_size_read(inode); > - if ((iattr->ia_valid & ATTR_SIZE) && iattr->ia_size > size) { > + if (new_size > size) { > update_isize =3D true; > - size =3D iattr->ia_size; > + size =3D new_size; > } > =20 > for (i =3D 0; i < nr_maps; i++) { > @@ -318,11 +317,13 @@ xfs_fs_commit_blocks( > xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); > xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); > =20 > - ASSERT(!(iattr->ia_valid & (ATTR_UID | ATTR_GID))); > - setattr_copy(&nop_mnt_idmap, inode, iattr); > + now =3D inode_set_ctime_current(inode); > + inode_set_atime_to_ts(inode, now); > + inode_set_mtime_to_ts(inode, now); > + > if (update_isize) { > - i_size_write(inode, iattr->ia_size); > - ip->i_disk_size =3D iattr->ia_size; > + i_size_write(inode, new_size); > + ip->i_disk_size =3D new_size; > } > =20 > xfs_trans_set_sync(tp); > diff --git a/include/linux/exportfs_block.h b/include/linux/exportfs_bloc= k.h > index 1f52fea8e4dc..d1dec4689b14 100644 > --- a/include/linux/exportfs_block.h > +++ b/include/linux/exportfs_block.h > @@ -9,7 +9,6 @@ > =20 > #include > =20 > -struct iattr; > struct inode; > struct iomap; > struct super_block; > @@ -33,7 +32,7 @@ struct exportfs_block_ops { > * the client. > */ > int (*commit_blocks)(struct inode *inode, struct iomap *iomaps, > - int nr_iomaps, struct iattr *iattr); > + int nr_iomaps, loff_t new_size); > }; > =20 > #endif /* LINUX_EXPORTFS_BLOCK_H */ I like this one. I think you can just fold the first patch in this series into this one, since you're making that change moot (and the ia_* times don't matter much anyway). Reviewed-by: Jeff Layton