]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Btrfs: clean up an error code in btrfs_init_space_info()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 13 Jan 2016 12:21:17 +0000 (15:21 +0300)
committerLuis Henriques <luis.henriques@canonical.com>
Tue, 2 Feb 2016 23:35:04 +0000 (23:35 +0000)
commit 0dc924c5f2a3c4d999e12feaccee5f970cea1315 upstream.

If we return 1 here, then the caller treats it as an error and returns
-EINVAL.  It causes a static checker warning to treat positive returns
as an error.

Fixes: 1aba86d67f34 ('Btrfs: fix easily get into ENOSPC in mixed case')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
fs/btrfs/extent-tree.c

index b6f19735d6a8b80ddeb8d1b9f2c2bc4638af47fa..482ebbcd1d72512836b270f924cec713ec4c1ddd 100644 (file)
@@ -9212,7 +9212,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)