xfs: make the seq argument to xfs_bmapi_convert_delalloc() optional

[ Upstream commit fc8d0ba0ff5fe4700fa02008b7751ec6b84b7677 ]

Allow callers to pass a NULLL seq argument if they don't care about
the fork sequence number.

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
Signed-off-by: Leah Rumancik <leah.rumancik@gmail.com>
Acked-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index f8a355e1196f5f21534535d8755542abeac5f9e2..92d321dd8944c04ccfaa31d4eecaba43d83d631c 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -4580,7 +4580,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;
        }
 
@@ -4626,7 +4627,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);