mirror of
https://github.com/nxp-imx/linux-imx.git
synced 2025-07-07 09:55:19 +02:00
xfs: make the seq argument to xfs_bmapi_convert_delalloc() optional
commit fc8d0ba0ff
upstream.
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: Catherine Hoang <catherine.hoang@oracle.com>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f24ba21831
commit
0f726c17df
|
@ -4595,6 +4595,7 @@ xfs_bmapi_convert_delalloc(
|
||||||
if (!isnullstartblock(bma.got.br_startblock)) {
|
if (!isnullstartblock(bma.got.br_startblock)) {
|
||||||
xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags,
|
xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags,
|
||||||
xfs_iomap_inode_sequence(ip, flags));
|
xfs_iomap_inode_sequence(ip, flags));
|
||||||
|
if (seq)
|
||||||
*seq = READ_ONCE(ifp->if_seq);
|
*seq = READ_ONCE(ifp->if_seq);
|
||||||
goto out_trans_cancel;
|
goto out_trans_cancel;
|
||||||
}
|
}
|
||||||
|
@ -4641,6 +4642,7 @@ xfs_bmapi_convert_delalloc(
|
||||||
ASSERT(!isnullstartblock(bma.got.br_startblock));
|
ASSERT(!isnullstartblock(bma.got.br_startblock));
|
||||||
xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags,
|
xfs_bmbt_to_iomap(ip, iomap, &bma.got, 0, flags,
|
||||||
xfs_iomap_inode_sequence(ip, flags));
|
xfs_iomap_inode_sequence(ip, flags));
|
||||||
|
if (seq)
|
||||||
*seq = READ_ONCE(ifp->if_seq);
|
*seq = READ_ONCE(ifp->if_seq);
|
||||||
|
|
||||||
if (whichfork == XFS_COW_FORK)
|
if (whichfork == XFS_COW_FORK)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user