From: Brian Foster <bfoster@redhat.com>
To: xfs@oss.sgi.com
Subject: Re: [PATCH 2/2] xfs: add xfs_setattr_time
Date: Mon, 18 Nov 2013 08:53:17 -0500 [thread overview]
Message-ID: <528A1BCD.9060900@redhat.com> (raw)
In-Reply-To: <20131118131052.GB21649@infradead.org>
On 11/18/2013 08:10 AM, Christoph Hellwig wrote:
> Split out a xfs_setattr_time helper to share code between truncate and
> regular setattr similar to xfs_setattr_mode. I might also have another
> caller growing for this in the near future.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_iops.c | 66 ++++++++++++++++++++++++------------------------------
> 1 file changed, 30 insertions(+), 36 deletions(-)
>
> Index: linux/fs/xfs/xfs_iops.c
> ===================================================================
> --- linux.orig/fs/xfs/xfs_iops.c 2013-11-18 11:54:46.083792257 +0100
> +++ linux/fs/xfs/xfs_iops.c 2013-11-18 11:55:34.891791256 +0100
> @@ -474,6 +474,32 @@ xfs_setattr_mode(
> inode->i_mode |= mode & ~S_IFMT;
> }
>
> +static void
> +xfs_setattr_time(
> + struct xfs_inode *ip,
> + struct iattr *iattr)
> +{
> + struct inode *inode = VFS_I(ip);
> +
> + ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
> +
> + if (iattr->ia_valid & ATTR_ATIME) {
> + inode->i_atime = iattr->ia_atime;
> + ip->i_d.di_atime.t_sec = iattr->ia_atime.tv_sec;
> + ip->i_d.di_atime.t_nsec = iattr->ia_atime.tv_nsec;
> + }
> + if (iattr->ia_valid & ATTR_CTIME) {
> + inode->i_ctime = iattr->ia_ctime;
> + ip->i_d.di_ctime.t_sec = iattr->ia_ctime.tv_sec;
> + ip->i_d.di_ctime.t_nsec = iattr->ia_ctime.tv_nsec;
> + }
> + if (iattr->ia_valid & ATTR_MTIME) {
> + inode->i_mtime = iattr->ia_mtime;
> + ip->i_d.di_mtime.t_sec = iattr->ia_mtime.tv_sec;
> + ip->i_d.di_mtime.t_nsec = iattr->ia_mtime.tv_nsec;
> + }
> +}
> +
> int
> xfs_setattr_nonsize(
> struct xfs_inode *ip,
> @@ -627,30 +653,10 @@ xfs_setattr_nonsize(
> }
> }
>
> - /*
> - * Change file access modes.
> - */
> if (mask & ATTR_MODE)
> xfs_setattr_mode(ip, iattr);
> -
> - /*
> - * Change file access or modified times.
> - */
> - if (mask & ATTR_ATIME) {
> - inode->i_atime = iattr->ia_atime;
> - ip->i_d.di_atime.t_sec = iattr->ia_atime.tv_sec;
> - ip->i_d.di_atime.t_nsec = iattr->ia_atime.tv_nsec;
> - }
> - if (mask & ATTR_CTIME) {
> - inode->i_ctime = iattr->ia_ctime;
> - ip->i_d.di_ctime.t_sec = iattr->ia_ctime.tv_sec;
> - ip->i_d.di_ctime.t_nsec = iattr->ia_ctime.tv_nsec;
> - }
> - if (mask & ATTR_MTIME) {
> - inode->i_mtime = iattr->ia_mtime;
> - ip->i_d.di_mtime.t_sec = iattr->ia_mtime.tv_sec;
> - ip->i_d.di_mtime.t_nsec = iattr->ia_mtime.tv_nsec;
> - }
> + if (mask & (ATTR_ATIME|ATTR_CTIME|ATTR_MTIME))
> + xfs_setattr_time(ip, iattr);
>
> xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
>
> @@ -865,22 +871,10 @@ xfs_setattr_size(
> xfs_inode_clear_eofblocks_tag(ip);
> }
>
> - /*
> - * Change file access modes.
> - */
> if (mask & ATTR_MODE)
> xfs_setattr_mode(ip, iattr);
> -
> - if (mask & ATTR_CTIME) {
> - inode->i_ctime = iattr->ia_ctime;
> - ip->i_d.di_ctime.t_sec = iattr->ia_ctime.tv_sec;
> - ip->i_d.di_ctime.t_nsec = iattr->ia_ctime.tv_nsec;
> - }
> - if (mask & ATTR_MTIME) {
> - inode->i_mtime = iattr->ia_mtime;
> - ip->i_d.di_mtime.t_sec = iattr->ia_mtime.tv_sec;
> - ip->i_d.di_mtime.t_nsec = iattr->ia_mtime.tv_nsec;
> - }
> + if (mask & (ATTR_ATIME|ATTR_CTIME|ATTR_MTIME))
> + xfs_setattr_time(ip, iattr);
>
> xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
>
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs
>
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-11-18 13:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-18 13:10 [PATCH 1/2] xfs: tiny xfs_setattr_mode cleanup Christoph Hellwig
2013-11-18 13:10 ` [PATCH 2/2] xfs: add xfs_setattr_time Christoph Hellwig
2013-11-18 13:53 ` Brian Foster [this message]
2013-11-18 13:52 ` [PATCH 1/2] xfs: tiny xfs_setattr_mode cleanup Brian Foster
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=528A1BCD.9060900@redhat.com \
--to=bfoster@redhat.com \
--cc=xfs@oss.sgi.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.