xfs: avoid setting XFS_ILOG_CORE if i_version doesn't need incrementing

If XFS_ILOG_CORE is already set then go ahead and increment it.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Acked-by: Darrick J. Wong <darrick.wong@oracle.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
Jeff Layton 2017-12-11 06:35:23 -05:00
parent e38cf302b2
commit d17260fd5f
1 changed files with 8 additions and 6 deletions

View File

@ -112,15 +112,17 @@ xfs_trans_log_inode(
/* /*
* First time we log the inode in a transaction, bump the inode change * First time we log the inode in a transaction, bump the inode change
* counter if it is configured for this to occur. We don't use * counter if it is configured for this to occur. While we have the
* inode_inc_version() because there is no need for extra locking around * inode locked exclusively for metadata modification, we can usually
* i_version as we already hold the inode locked exclusively for * avoid setting XFS_ILOG_CORE if no one has queried the value since
* metadata modification. * the last time it was incremented. If we have XFS_ILOG_CORE already
* set however, then go ahead and bump the i_version counter
* unconditionally.
*/ */
if (!(ip->i_itemp->ili_item.li_desc->lid_flags & XFS_LID_DIRTY) && if (!(ip->i_itemp->ili_item.li_desc->lid_flags & XFS_LID_DIRTY) &&
IS_I_VERSION(VFS_I(ip))) { IS_I_VERSION(VFS_I(ip))) {
inode_inc_iversion(VFS_I(ip)); if (inode_maybe_inc_iversion(VFS_I(ip), flags & XFS_ILOG_CORE))
flags |= XFS_ILOG_CORE; flags |= XFS_ILOG_CORE;
} }
tp->t_flags |= XFS_TRANS_DIRTY; tp->t_flags |= XFS_TRANS_DIRTY;