From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 13 Jan 2016 12:21:17 +0000 (+0300)
Subject: Btrfs: clean up an error code in btrfs_init_space_info()
X-Git-Tag: v3.16.35~528
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=269764167f780ff1f6fbf1180fe26cd3b886185c;p=thirdparty%2Fkernel%2Fstable.git

Btrfs: clean up an error code in btrfs_init_space_info()

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>
---

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index b6f19735d6a8b..482ebbcd1d725 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -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)