diff options
| author | Chris Mason <clm@fb.com> | 2016-01-19 18:21:00 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-19 18:21:00 -0800 |
| commit | acc308556c812485462b6b43843c3f64530dd843 (patch) | |
| tree | fa26745572077d32d446e5fc444eb253812577d1 /fs/btrfs/extent-tree.c | |
| parent | 988f1f576d4f7531cb2175ee1b7cb7afd6d95d22 (diff) | |
| parent | fb75d857a31d600cc0c37b8c7d914014f7fa3f9a (diff) | |
| download | linux-acc308556c812485462b6b43843c3f64530dd843.tar.bz2 | |
Merge branch 'misc-cleanups-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 60cc1399c64f..92843ab772a5 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -10399,7 +10399,7 @@ btrfs_start_trans_remove_block_group(struct btrfs_fs_info *fs_info, * more device items and remove one chunk item), but this is done at * btrfs_remove_chunk() through a call to check_system_chunk(). */ - map = (struct map_lookup *)em->bdev; + map = em->map_lookup; num_items = 3 + map->num_stripes; free_extent_map(em); @@ -10586,7 +10586,7 @@ int btrfs_init_space_info(struct btrfs_fs_info *fs_info) disk_super = fs_info->super_copy; if (!btrfs_super_root(disk_super)) - return 1; + return -EINVAL; features = btrfs_super_incompat_flags(disk_super); if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS) |