diff options
| author | Dave Chinner <[email protected]> | 2016-03-06 22:30:32 +0000 |
|---|---|---|
| committer | Dave Chinner <[email protected]> | 2016-03-06 22:30:32 +0000 |
| commit | a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f (patch) | |
| tree | 892f8d40b2267422d2d38a62acace8ed613f71a8 /fs/xfs/xfs_trans_inode.c | |
| parent | Merge branch 'xfs-misc-fixes-4.6' into for-next (diff) | |
| parent | xfs: mode di_mode to vfs inode (diff) | |
| download | kernel-a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f.tar.gz kernel-a2bbcb60ff9a8e8a4159e11bc3ed84f7221fe79f.zip | |
Merge branch 'xfs-gut-icdinode-4.6' into for-next
Diffstat (limited to 'fs/xfs/xfs_trans_inode.c')
| -rw-r--r-- | fs/xfs/xfs_trans_inode.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/fs/xfs/xfs_trans_inode.c b/fs/xfs/xfs_trans_inode.c index b97f1df910ab..11a3af08b5c7 100644 --- a/fs/xfs/xfs_trans_inode.c +++ b/fs/xfs/xfs_trans_inode.c @@ -75,18 +75,10 @@ xfs_trans_ichgtime( tv = current_fs_time(inode->i_sb); - if ((flags & XFS_ICHGTIME_MOD) && - !timespec_equal(&inode->i_mtime, &tv)) { + if (flags & XFS_ICHGTIME_MOD) inode->i_mtime = tv; - ip->i_d.di_mtime.t_sec = tv.tv_sec; - ip->i_d.di_mtime.t_nsec = tv.tv_nsec; - } - if ((flags & XFS_ICHGTIME_CHG) && - !timespec_equal(&inode->i_ctime, &tv)) { + if (flags & XFS_ICHGTIME_CHG) inode->i_ctime = tv; - ip->i_d.di_ctime.t_sec = tv.tv_sec; - ip->i_d.di_ctime.t_nsec = tv.tv_nsec; - } } /* @@ -125,7 +117,7 @@ xfs_trans_log_inode( */ if (!(ip->i_itemp->ili_item.li_desc->lid_flags & XFS_LID_DIRTY) && IS_I_VERSION(VFS_I(ip))) { - ip->i_d.di_changecount = ++VFS_I(ip)->i_version; + VFS_I(ip)->i_version++; flags |= XFS_ILOG_CORE; } |