From a0f0edd2586b14f6c6c909e2cfe22201b8131212 Mon Sep 17 00:00:00 2001 From: Miao Xie Date: Thu, 7 Feb 2013 06:01:35 +0000 Subject: [PATCH] --- yaml --- r: 360441 b: refs/heads/master c: 2b8195bb5717729e4e94ab4ad73a543feaafb0a2 h: refs/heads/master i: 360439: c8c423e30ad28be1ee61ad2086a609115436bf1d v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7fd5111d1cf2..bb0c6265cdf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb95e7bf7ba481c3d35b238b1cd671b63f54238a +refs/heads/master: 2b8195bb5717729e4e94ab4ad73a543feaafb0a2 diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index 259d7891d10c..9fcce54ecde4 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/fs/btrfs/disk-io.c @@ -2711,13 +2711,13 @@ int open_ctree(struct super_block *sb, * kthreads */ filemap_write_and_wait(fs_info->btree_inode->i_mapping); - invalidate_inode_pages2(fs_info->btree_inode->i_mapping); fail_block_groups: btrfs_free_block_groups(fs_info); fail_tree_roots: free_root_pointers(fs_info, 1); + invalidate_inode_pages2(fs_info->btree_inode->i_mapping); fail_sb_buffer: btrfs_stop_workers(&fs_info->generic_worker); @@ -2738,7 +2738,6 @@ int open_ctree(struct super_block *sb, fail_iput: btrfs_mapping_tree_free(&fs_info->mapping_tree); - invalidate_inode_pages2(fs_info->btree_inode->i_mapping); iput(fs_info->btree_inode); fail_delalloc_bytes: percpu_counter_destroy(&fs_info->delalloc_bytes);