diff options
| author | Chris Mason <chris.mason@oracle.com> | 2008-03-24 15:02:07 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:01 -0400 |
| commit | 0d81ba5dbedef0c3970d6aa318aa84920943e6e3 (patch) | |
| tree | 2c5256b4a4e4d544add986e654db56e660f4fb12 /fs/btrfs/disk-io.c | |
| parent | e085def2c4cc2d7c0c316376b4b66b86b10e3a4b (diff) | |
| download | lwn-0d81ba5dbedef0c3970d6aa318aa84920943e6e3.tar.gz lwn-0d81ba5dbedef0c3970d6aa318aa84920943e6e3.zip | |
Btrfs: Move device information into the super block so it can be scanned
Signed-off-by: Chris Mason <chris.mason@oracle.com>
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 2a239ae49f78..26185d46712c 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -370,7 +370,6 @@ static int close_all_devices(struct btrfs_fs_info *fs_info) next = list->next; list_del(next); device = list_entry(next, struct btrfs_device, dev_list); - kfree(device->name); kfree(device); } return 0; @@ -800,6 +799,9 @@ struct btrfs_root *open_ctree(struct super_block *sb) } mutex_lock(&fs_info->fs_mutex); + ret = btrfs_read_super_device(tree_root, fs_info->sb_buffer); + BUG_ON(ret); + ret = btrfs_read_sys_array(tree_root); BUG_ON(ret); |