1 files changed, 5 insertions, 3 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 6efaee8d7739..1e3e414c8501 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2830,9 +2830,11 @@ retry_root_backup:
                 btrfs_set_opt(fs_info->mount_opt, SSD);
         }
 
-        /* Set the real inode map cache flag */
-        if (btrfs_test_opt(tree_root, CHANGE_INODE_CACHE))
-                btrfs_set_opt(tree_root->fs_info->mount_opt, INODE_MAP_CACHE);
+        /*
+         * Mount does not set all options immediatelly, we can do it now and do
+         * not have to wait for transaction commit
+         */
+        btrfs_apply_pending_changes(fs_info);
 
 #ifdef CONFIG_BTRFS_FS_CHECK_INTEGRITY
         if (btrfs_test_opt(tree_root, CHECK_INTEGRITY)) {