From: Brian Foster <bfoster@redhat.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 1/2] xfs: remove xfs_vn_setattr_nonsize
Date: Fri, 11 Dec 2020 11:16:28 -0500 [thread overview]
Message-ID: <20201211161628.GF2032335@bfoster> (raw)
In-Reply-To: <20201210054821.2704734-2-hch@lst.de>
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@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> 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
>
next prev parent reply other threads:[~2020-12-11 17:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 5:48 two small setattr cleanups Christoph Hellwig
2020-12-10 5:48 ` [PATCH 1/2] xfs: remove xfs_vn_setattr_nonsize Christoph Hellwig
2020-12-10 7:42 ` Gao Xiang
2020-12-11 16:16 ` Brian Foster [this message]
2020-12-10 5:48 ` [PATCH 2/2] xfs: open code updating i_mode in xfs_set_acl Christoph Hellwig
2020-12-10 7:48 ` Gao Xiang
2020-12-11 16:17 ` Brian Foster
2021-01-20 19:39 ` two small setattr cleanups Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201211161628.GF2032335@bfoster \
--to=bfoster@redhat.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox