On Mon, Dec 03, 2018 at 05:24:53PM -0500, Christoph Hellwig wrote:
> Opencoding this function in the only caller makes it blindly obvious
> what is going on instead of having to look at two files for that.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_bmap.c | 11 -----------
> fs/xfs/libxfs/xfs_bmap.h | 1 -
> fs/xfs/xfs_aops.c | 2 +-
> 3 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 19e921d1586f..f16d42abc500 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -3685,17 +3685,6 @@ xfs_trim_extent(
> }
> }
>
> -/* trim extent to within eof */
> -void
> -xfs_trim_extent_eof(
> - struct xfs_bmbt_irec *irec,
> - struct xfs_inode *ip)
> -
> -{
> - xfs_trim_extent(irec, 0, XFS_B_TO_FSB(ip->i_mount,
> - i_size_read(VFS_I(ip))));
> -}
> -
> /*
> * Trim the returned map to the required bounds
> */
> diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
> index 488dc8860fd7..f9a925caa70e 100644
> --- a/fs/xfs/libxfs/xfs_bmap.h
> +++ b/fs/xfs/libxfs/xfs_bmap.h
> @@ -181,7 +181,6 @@ static inline bool xfs_bmap_is_real_extent(struct xfs_bmbt_irec *irec)
>
> void xfs_trim_extent(struct xfs_bmbt_irec *irec, xfs_fileoff_t bno,
> xfs_filblks_t len);
> -void xfs_trim_extent_eof(struct xfs_bmbt_irec *, struct xfs_inode *);
> int xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd);
> int xfs_bmap_set_attrforkoff(struct xfs_inode *ip, int size, int *version);
> void xfs_bmap_local_to_extents_empty(struct xfs_inode *ip, int whichfork);
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index 338b9d9984e0..d7275075878e 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -329,7 +329,7 @@ xfs_map_blocks(
> * mechanism to protect us from arbitrary extent modifying contexts, not
> * just eofblocks.
> */
> - xfs_trim_extent_eof(&wpc->imap, ip);
> + xfs_trim_extent(&wpc->imap, 0, XFS_B_TO_FSB(mp, i_size_read(inode)));
>
> /*
> * COW fork blocks can overlap data fork blocks even if the blocks
> --
> 2.19.1
>
