diff options
| author | Chris Mason <clm@fb.com> | 2014-11-25 05:45:30 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-11-25 05:45:30 -0800 |
| commit | ad27c0dab76a7abc8809ec41ae59cf67de5ea906 (patch) | |
| tree | 5ae495bc5d4d3eafa54c2ca5f7c5e5482516e4ec /fs/btrfs/disk-io.c | |
| parent | b38ef71cb102208dffcf4e8524e9d5ec4ec0eaa9 (diff) | |
| parent | a6f69dc8018dbb4ce2009ccba49b53f68c8bdc64 (diff) | |
Merge branch 'dev/pending-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 8 |
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)) { |