xfs: remove xfs_vn_setattr_nonsize

Merge xfs_vn_setattr_nonsize into the only caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Gao Xiang <hsiangkao@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index d1ecf76..a0644da 100644 (file)
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -824,22 +824,6 @@ out_dqrele:
        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.
  *
@@ -1067,11 +1051,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);
@@ -1086,7 +1070,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 4d24ff3..a91e2d1 100644 (file)
--- 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__ */