xfs: tiny xfs_setattr_mode cleanup
PATCH 1/2 xfs: tiny xfs_setattr_mode cleanup
Remove the pointless tp argument, and properly align the local variable declarations.
--- fs/xfs/xfs_iops.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
fs/xfs/xfs_iops.c +4 -6
@@ -459,14 +459,12 @@ xfs_vn_getattr(static void xfs_setattr_mode ( -struct xfs_trans *tp,struct xfs_inode *ip,struct iattr *iattr) { -struct inode *inode =VFS_I (ip); -umode_t mode = iattr->ia_mode; +struct inode *inode =VFS_I (ip); +umode_t mode = iattr->ia_mode; -ASSERT (tp);ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL )); ip->i_d.di_mode &=S_IFMT ;
@@ -633,7 +631,7 @@ xfs_setattr_nonsize(* Change file access modes. */ if (mask &ATTR_MODE ) -xfs_setattr_mode (tp, ip, iattr); +xfs_setattr_mode (ip, iattr);/* * Change file access or modified times.
@@ -871,7 +869,7 @@ xfs_setattr_size(* Change file access modes. */ if (mask &ATTR_MODE ) -xfs_setattr_mode (tp, ip, iattr); +xfs_setattr_mode (ip, iattr);if (mask &ATTR_CTIME ) { inode->i_ctime = iattr->ia_ctime;
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
PATCH 2/2 xfs: add xfs_setattr_time
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.
--- fs/xfs/xfs_iops.c | 66 ++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 36 deletions(-)
fs/xfs/xfs_iops.c +30 -36
@@ -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
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Re: [PATCH 2/2] xfs: add xfs_setattr_time
Quoted 7 lines · Christoph Hellwig
Split out a
xfs_setattr_timehelper to share code between truncate and regular setattr similar toxfs_setattr_mode. I might also have another caller growing for this in the near future.Signed-off-by Christoph Hellwig <[email protected]>---
Quoted 99 lines
fs/xfs/xfs_iops.c | 66 ++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 36 deletions(-)Index:
linux/fs/xfs/xfs_iops.c
===================================================================fs/xfs/xfs_iops.c +30
-36@@ -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 );
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 6 lines · Christoph Hellwig
Remove the pointless tp argument, and properly align the local variable declarations.
Signed-off-by Christoph Hellwig <[email protected]>---
Quoted 43 lines
fs/xfs/xfs_iops.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)Index:
linux/fs/xfs/xfs_iops.c
===================================================================fs/xfs/xfs_iops.c +4
-6@@ -459,14 +459,12 @@ xfs_vn_getattr(static void xfs_setattr_mode ( -struct xfs_trans *tp,struct xfs_inode *ip,struct iattr *iattr) { -struct inode *inode =VFS_I (ip); -umode_t mode = iattr->ia_mode; +struct inode *inode =VFS_I (ip); +umode_t mode = iattr->ia_mode; -ASSERT (tp);ASSERT (xfs_isilocked (ip,XFS_ILOCK_EXCL )); ip->i_d.di_mode &=S_IFMT ;@@ -633,7 +631,7 @@ xfs_setattr_nonsize(* Change file access modes. */ if (mask &ATTR_MODE ) -xfs_setattr_mode (tp, ip, iattr); +xfs_setattr_mode (ip, iattr);/* * Change file access or modified times. @@ -871,7 +869,7 @@ xfs_setattr_size(* Change file access modes. */ if (mask &ATTR_MODE ) -xfs_setattr_mode (tp, ip, iattr); +xfs_setattr_mode (ip, iattr);if (mask &ATTR_CTIME ) { inode->i_ctime = iattr->ia_ctime;
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs