1 files changed, 11 insertions, 1 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 3fc8d854d7fb..4a04659fded7 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -5420,9 +5420,19 @@ log_extents:
                 }
         }
 
+        /*
+         * Don't update last_log_commit if we logged that an inode exists after
+         * it was loaded to memory (full_sync bit set).
+         * This is to prevent data loss when we do a write to the inode, then
+         * the inode gets evicted after all delalloc was flushed, then we log
+         * it exists (due to a rename for example) and then fsync it. This last
+         * fsync would do nothing (not logging the extents previously written).
+         */
         spin_lock(&inode->lock);
         inode->logged_trans = trans->transid;
-        inode->last_log_commit = inode->last_sub_trans;
+        if (inode_only != LOG_INODE_EXISTS ||
+            !test_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &inode->runtime_flags))
+                inode->last_log_commit = inode->last_sub_trans;
         spin_unlock(&inode->lock);
 out_unlock:
         mutex_unlock(&inode->log_mutex);