Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "I've got a revert to fix a regression with btrfs device registration,
  and Filipe has part two of his fsync fix from last week"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Revert "Btrfs: device_list_add() should not update list when mounted"
  Btrfs: set inode's logged_trans/last_log_commit after ranged fsync

1 files changed, 2 insertions, 12 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index d296efe2d3e7..1d1ba083ca6e 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -4093,18 +4093,8 @@ log_extents:
                 }
         }
 
-        write_lock(&em_tree->lock);
-        /*
-         * If we're doing a ranged fsync and there are still modified extents
-         * in the list, we must run on the next fsync call as it might cover
-         * those extents (a full fsync or an fsync for other range).
-         */
-        if (list_empty(&em_tree->modified_extents)) {
-                BTRFS_I(inode)->logged_trans = trans->transid;
-                BTRFS_I(inode)->last_log_commit =
-                        BTRFS_I(inode)->last_sub_trans;
-        }
-        write_unlock(&em_tree->lock);
+        BTRFS_I(inode)->logged_trans = trans->transid;
+        BTRFS_I(inode)->last_log_commit = BTRFS_I(inode)->last_sub_trans;
 out_unlock:
         if (unlikely(err))
                 btrfs_put_logged_extents(&logged_list);