From 7dd998b841ff0490978b27d8f8eeccce0cd5bb1a Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Wed, 9 Nov 2011 13:26:37 +0200 Subject: [PATCH] --- yaml --- r: 275319 b: refs/heads/master c: 586e46e2813c589d26258a599580421fb6fb576b h: refs/heads/master i: 275317: 0b2a5529110d469b6955bbf49e56e22483629099 275315: e3f503baff8bd0491aca8aef35cfd40a606009c9 275311: 1af534d50c6d984bc3567ae388fcef0107d052f3 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f259c55f02ec..9befc694e526 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d34b2789538befa45a68a191dc12e0886a69f7d +refs/heads/master: 586e46e2813c589d26258a599580421fb6fb576b diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index 91db90b526c2..b6a5c0dd0dd8 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/fs/btrfs/disk-io.c @@ -2460,21 +2460,20 @@ struct btrfs_root *open_ctree(struct super_block *sb, btrfs_stop_workers(&fs_info->caching_workers); fail_alloc: fail_iput: + btrfs_mapping_tree_free(&fs_info->mapping_tree); + invalidate_inode_pages2(fs_info->btree_inode->i_mapping); iput(fs_info->btree_inode); - - btrfs_close_devices(fs_info->fs_devices); - btrfs_mapping_tree_free(&fs_info->mapping_tree); fail_bdi: bdi_destroy(&fs_info->bdi); fail_srcu: cleanup_srcu_struct(&fs_info->subvol_srcu); fail: + btrfs_close_devices(fs_info->fs_devices); free_fs_info(fs_info); return ERR_PTR(err); recovery_tree_root: - if (!btrfs_test_opt(tree_root, RECOVERY)) goto fail_tree_roots;