aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-07-17 12:54:48 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:05 -0400
commit54641bd17db9fbfc13c7b1d4ee0dd2713bf3e076 (patch)
tree43e33d13697fb6decb2e460908833da0b92befb3 /fs
parent0bd40a718444b28793283b70286f9e29d464a189 (diff)
Btrfs: Force caching of metadata block groups on mount to avoid deadlock
This is a temporary change to avoid deadlocks until the extent tree locking is fixed up. Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/extent-tree.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 4036c62b6671..be2aef1cb7ae 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3333,6 +3333,11 @@ int btrfs_read_block_groups(struct btrfs_root *root)
3333 set_state_private(block_group_cache, found_key.objectid, 3333 set_state_private(block_group_cache, found_key.objectid,
3334 (unsigned long)cache); 3334 (unsigned long)cache);
3335 3335
3336 /* hack for now */
3337 if (cache->flags & BTRFS_BLOCK_GROUP_METADATA) {
3338 cache_block_group(root->fs_info->extent_root,
3339 cache);
3340 }
3336 if (key.objectid >= 3341 if (key.objectid >=
3337 btrfs_super_total_bytes(&info->super_copy)) 3342 btrfs_super_total_bytes(&info->super_copy))
3338 break; 3343 break;