On Thu, Dec 10, 2020 at 06:48:20AM +0100, Christoph Hellwig wrote:
> Merge xfs_vn_setattr_nonsize into the only caller.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_iops.c | 26 +++++++-------------------
> fs/xfs/xfs_iops.h | 1 -
> 2 files changed, 7 insertions(+), 20 deletions(-)
>
> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> index 1414ab79eacfc2..54c7c94f82951b 100644
> --- a/fs/xfs/xfs_iops.c
> +++ b/fs/xfs/xfs_iops.c
> @@ -826,22 +826,6 @@ xfs_setattr_nonsize(
> return error;
> }
>
> -int
> -xfs_vn_setattr_nonsize(
> - struct dentry *dentry,
> - struct iattr *iattr)
> -{
> - struct xfs_inode *ip = XFS_I(d_inode(dentry));
> - int error;
> -
> - trace_xfs_setattr(ip);
> -
> - error = xfs_vn_change_ok(dentry, iattr);
> - if (error)
> - return error;
> - return xfs_setattr_nonsize(ip, iattr, 0);
> -}
> -
> /*
> * Truncate file. Must have write permission and not be a directory.
> *
> @@ -1069,11 +1053,11 @@ xfs_vn_setattr(
> struct dentry *dentry,
> struct iattr *iattr)
> {
> + struct inode *inode = d_inode(dentry);
> + struct xfs_inode *ip = XFS_I(inode);
> int error;
>
> if (iattr->ia_valid & ATTR_SIZE) {
> - struct inode *inode = d_inode(dentry);
> - struct xfs_inode *ip = XFS_I(inode);
> uint iolock;
>
> xfs_ilock(ip, XFS_MMAPLOCK_EXCL);
> @@ -1088,7 +1072,11 @@ xfs_vn_setattr(
> error = xfs_vn_setattr_size(dentry, iattr);
> xfs_iunlock(ip, XFS_MMAPLOCK_EXCL);
> } else {
> - error = xfs_vn_setattr_nonsize(dentry, iattr);
> + trace_xfs_setattr(ip);
> +
> + error = xfs_vn_change_ok(dentry, iattr);
> + if (!error)
> + error = xfs_setattr_nonsize(ip, iattr, 0);
> }
>
> return error;
> diff --git a/fs/xfs/xfs_iops.h b/fs/xfs/xfs_iops.h
> index 4d24ff309f593f..a91e2d1b47b45d 100644
> --- a/fs/xfs/xfs_iops.h
> +++ b/fs/xfs/xfs_iops.h
> @@ -21,7 +21,6 @@ extern ssize_t xfs_vn_listxattr(struct dentry *, char *data, size_t size);
> extern void xfs_setattr_time(struct xfs_inode *ip, struct iattr *iattr);
> extern int xfs_setattr_nonsize(struct xfs_inode *ip, struct iattr *vap,
> int flags);
> -extern int xfs_vn_setattr_nonsize(struct dentry *dentry, struct iattr *vap);
> extern int xfs_vn_setattr_size(struct dentry *dentry, struct iattr *vap);
>
> #endif /* __XFS_IOPS_H__ */
> --
> 2.29.2
>
