diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
| commit | caa70ccf8cc719acb0540b558b4e075796778db8 (patch) | |
| tree | e8173307b04eca62168415be04e7800bdf011f80 /fs/btrfs/disk-io.c | |
| parent | 56d667f87e81d15d43f264007322f1179ce1722e (diff) | |
| parent | 3ec10cd8b526c6b10170c2649002672ee2019e73 (diff) | |
Merge branch 'linux-linaro-2.6.38-master' into for-ubuntuu2
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index e1aa8d607bc..edd9efa5156 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1184,8 +1184,10 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root, root->commit_root = btrfs_root_node(root); BUG_ON(!root->node); out: - if (location->objectid != BTRFS_TREE_LOG_OBJECTID) + if (location->objectid != BTRFS_TREE_LOG_OBJECTID) { root->ref_cows = 1; + btrfs_check_and_init_root_item(&root->root_item); + } return root; } |