diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2012-06-22 12:24:12 -0600 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2012-07-02 15:39:16 -0400 |
| commit | 68310a5e42f93c2242ec1836c3b18d531e0065e2 (patch) | |
| tree | cf457369274a1633ba02170fcb6aab0114906f0a /fs/btrfs/disk-io.c | |
| parent | c3473e830074ef04f974f2829690942dd8580619 (diff) | |
| download | blackbird-op-linux-68310a5e42f93c2242ec1836c3b18d531e0065e2.tar.gz blackbird-op-linux-68310a5e42f93c2242ec1836c3b18d531e0065e2.zip | |
Btrfs: restore restriper state on all mounts
Fix a bug that triggered asserts in btrfs_balance() in both normal and
resume modes -- restriper state was not properly restored on read-only
mounts. This factors out resuming code from btrfs_restore_balance(),
which is now also called earlier in the mount sequence to avoid the
problem of some early writes getting the old profile.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 7d7bc8eace86..3a7961ba161e 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2354,12 +2354,17 @@ retry_root_backup: BTRFS_CSUM_TREE_OBJECTID, csum_root); if (ret) goto recovery_tree_root; - csum_root->track_dirty = 1; fs_info->generation = generation; fs_info->last_trans_committed = generation; + ret = btrfs_recover_balance(fs_info); + if (ret) { + printk(KERN_WARNING "btrfs: failed to recover balance\n"); + goto fail_block_groups; + } + ret = btrfs_init_dev_stats(fs_info); if (ret) { printk(KERN_ERR "btrfs: failed to init dev_stats: %d\n", @@ -2492,9 +2497,6 @@ retry_root_backup: err = btrfs_orphan_cleanup(fs_info->tree_root); up_read(&fs_info->cleanup_work_sem); - if (!err) - err = btrfs_recover_balance(fs_info->tree_root); - if (err) { close_ctree(tree_root); return err; |
