Message ID | 20240315125354.2480344-3-yi.zhang@huaweicloud.com (mailing list archive) |
---|---|
State | New |
Headers | show |
Series | xfs/iomap: fix non-atomic clone operation and don't update size when zeroing range post eof | expand |
The patch looks good to me:
Reviewed-by: Christoph Hellwig <hch@lst.de>
But maybe I'd reword the commit message a bit, i.e.:
xfs: make the seq argument to xfs_bmapi_convert_delalloc optional
Allow callers to pass a NULLL seq argument if they don't care about
the fork sequence number.
On 2024/3/18 9:28, Christoph Hellwig wrote: > The patch looks good to me: > > Reviewed-by: Christoph Hellwig <hch@lst.de> > > But maybe I'd reword the commit message a bit, i.e.: > > xfs: make the seq argument to xfs_bmapi_convert_delalloc optional > > Allow callers to pass a NULLL seq argument if they don't care about > the fork sequence number. > Okay, that's clearer. Thanks, Yi.
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index f362345467fa..07dc35de8ce5 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -4574,7 +4574,8 @@ xfs_bmapi_convert_delalloc( if (!isnullstartblock(bma.got.br_startblock)) { xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags, xfs_iomap_inode_sequence(ip, flags)); - *seq = READ_ONCE(ifp->if_seq); + if (seq) + *seq = READ_ONCE(ifp->if_seq); goto out_trans_cancel; } @@ -4623,7 +4624,8 @@ xfs_bmapi_convert_delalloc( ASSERT(!isnullstartblock(bma.got.br_startblock)); xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags, xfs_iomap_inode_sequence(ip, flags)); - *seq = READ_ONCE(ifp->if_seq); + if (seq) + *seq = READ_ONCE(ifp->if_seq); if (whichfork == XFS_COW_FORK) xfs_refcount_alloc_cow_extent(tp, bma.blkno, bma.length);