aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/xfs/xfs_iops.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 27e0e544e963..e7f4e4f4eab9 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -459,14 +459,12 @@ xfs_vn_getattr(
459 459
460static void 460static void
461xfs_setattr_mode( 461xfs_setattr_mode(
462 struct xfs_trans *tp,
463 struct xfs_inode *ip, 462 struct xfs_inode *ip,
464 struct iattr *iattr) 463 struct iattr *iattr)
465{ 464{
466 struct inode *inode = VFS_I(ip); 465 struct inode *inode = VFS_I(ip);
467 umode_t mode = iattr->ia_mode; 466 umode_t mode = iattr->ia_mode;
468 467
469 ASSERT(tp);
470 ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); 468 ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
471 469
472 ip->i_d.di_mode &= S_IFMT; 470 ip->i_d.di_mode &= S_IFMT;
@@ -633,7 +631,7 @@ xfs_setattr_nonsize(
633 * Change file access modes. 631 * Change file access modes.
634 */ 632 */
635 if (mask & ATTR_MODE) 633 if (mask & ATTR_MODE)
636 xfs_setattr_mode(tp, ip, iattr); 634 xfs_setattr_mode(ip, iattr);
637 635
638 /* 636 /*
639 * Change file access or modified times. 637 * Change file access or modified times.
@@ -871,7 +869,7 @@ xfs_setattr_size(
871 * Change file access modes. 869 * Change file access modes.
872 */ 870 */
873 if (mask & ATTR_MODE) 871 if (mask & ATTR_MODE)
874 xfs_setattr_mode(tp, ip, iattr); 872 xfs_setattr_mode(ip, iattr);
875 873
876 if (mask & ATTR_CTIME) { 874 if (mask & ATTR_CTIME) {
877 inode->i_ctime = iattr->ia_ctime; 875 inode->i_ctime = iattr->ia_ctime;