On Mon, Apr 05, 2021 at 10:59:03AM -0400, Brian Foster wrote:
> xfs_setfilesize() is the only remaining caller of the internal
> __xfs_setfilesize() helper. Fold them into a single function.
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
LGTM
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_aops.c | 29 +++++++++--------------------
> 1 file changed, 9 insertions(+), 20 deletions(-)
>
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index a7f91f4186bc..87c2912f147d 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -42,14 +42,20 @@ static inline bool xfs_ioend_is_append(struct iomap_ioend *ioend)
> /*
> * Update on-disk file size now that data has been written to disk.
> */
> -STATIC int
> -__xfs_setfilesize(
> +int
> +xfs_setfilesize(
> struct xfs_inode *ip,
> - struct xfs_trans *tp,
> xfs_off_t offset,
> size_t size)
> {
> + struct xfs_mount *mp = ip->i_mount;
> + struct xfs_trans *tp;
> xfs_fsize_t isize;
> + int error;
> +
> + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_fsyncts, 0, 0, 0, &tp);
> + if (error)
> + return error;
>
> xfs_ilock(ip, XFS_ILOCK_EXCL);
> isize = xfs_new_eof(ip, offset + size);
> @@ -68,23 +74,6 @@ __xfs_setfilesize(
> return xfs_trans_commit(tp);
> }
>
> -int
> -xfs_setfilesize(
> - struct xfs_inode *ip,
> - xfs_off_t offset,
> - size_t size)
> -{
> - struct xfs_mount *mp = ip->i_mount;
> - struct xfs_trans *tp;
> - int error;
> -
> - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_fsyncts, 0, 0, 0, &tp);
> - if (error)
> - return error;
> -
> - return __xfs_setfilesize(ip, tp, offset, size);
> -}
> -
> /*
> * IO write completion.
> */
> --
> 2.26.3
>
