1 files changed, 11 insertions, 17 deletions

diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 977c4aec587e..9794b876d6ff 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -232,6 +232,15 @@ xfs_inode_item_format(
         nvecs        = 1;
 
         /*
+         * Make sure the linux inode is dirty. We do this before
+         * clearing i_update_core as the VFS will call back into
+         * XFS here and set i_update_core, so we need to dirty the
+         * inode first so that the ordering of i_update_core and
+         * unlogged modifications still works as described below.
+         */
+        xfs_mark_inode_dirty_sync(ip);
+
+        /*
          * Clear i_update_core if the timestamps (or any other
          * non-transactional modification) need flushing/logging
          * and we're about to log them with the rest of the core.
@@ -263,22 +272,9 @@ xfs_inode_item_format(
         }
 
         /*
-         * We don't have to worry about re-ordering here because
-         * the update_size field is protected by the inode lock
-         * and we have that held in exclusive mode.
+         * Make sure to get the latest timestamps from the Linux inode.
          */
-        if (ip->i_update_size)
-                ip->i_update_size = 0;
-
-        /*
-         * Make sure to get the latest atime from the Linux inode.
-         */
-        xfs_synchronize_atime(ip);
-
-        /*
-         * make sure the linux inode is dirty
-         */
-        xfs_mark_inode_dirty_sync(ip);
+        xfs_synchronize_times(ip);
 
         vecp->i_addr = (xfs_caddr_t)&ip->i_d;
         vecp->i_len  = sizeof(struct xfs_icdinode);
@@ -712,8 +708,6 @@ xfs_inode_item_unlock(
          * Clear out the fields of the inode log item particular
          * to the current transaction.
          */
-        iip->ili_ilock_recur = 0;
-        iip->ili_iolock_recur = 0;
         iip->ili_flags = 0;
 
         /*