btrfs: fix the btrfs_get_global_root return value

btrfs_grab_root returns either the root or NULL, and the callers of
btrfs_get_global_root expect it to return the same.  But all the more
recently added roots instead return an ERR_PTR, so fix this.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 6e0d4f99ab046c66f9596ae583687f0df5f6f941..4d347995fcaa23ad7bf1bb99c7dae3a174c1e338 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1183,19 +1183,13 @@ static struct btrfs_root *btrfs_get_global_root(struct btrfs_fs_info *fs_info,
        if (objectid == BTRFS_CSUM_TREE_OBJECTID)
                return btrfs_grab_root(btrfs_global_root(fs_info, &key));
        if (objectid == BTRFS_QUOTA_TREE_OBJECTID)
-               return btrfs_grab_root(fs_info->quota_root) ?
-                       fs_info->quota_root : ERR_PTR(-ENOENT);
+               return btrfs_grab_root(fs_info->quota_root);
        if (objectid == BTRFS_UUID_TREE_OBJECTID)
-               return btrfs_grab_root(fs_info->uuid_root) ?
-                       fs_info->uuid_root : ERR_PTR(-ENOENT);
+               return btrfs_grab_root(fs_info->uuid_root);
        if (objectid == BTRFS_BLOCK_GROUP_TREE_OBJECTID)
-               return btrfs_grab_root(fs_info->block_group_root) ?
-                       fs_info->block_group_root : ERR_PTR(-ENOENT);
-       if (objectid == BTRFS_FREE_SPACE_TREE_OBJECTID) {
-               struct btrfs_root *root = btrfs_global_root(fs_info, &key);
-
-               return btrfs_grab_root(root) ? root : ERR_PTR(-ENOENT);
-       }
+               return btrfs_grab_root(fs_info->block_group_root);
+       if (objectid == BTRFS_FREE_SPACE_TREE_OBJECTID)
+               return btrfs_grab_root(btrfs_global_root(fs_info, &key));
        return NULL;
 }