Skip to contentSkip to conversation

Btrfs: clean up an error code in btrfs_init_space_info()

PATCH In review Dan Carpenter 3 participants 3 messages Jan 13, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Btrfs: clean up an error code in btrfs_init_space_info()

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

---
I would appreciate a little review here. This patch doesn't change behavior, but it's possible that we had intended to do something else.

fs/btrfs/extent-tree.c +1 -1
index 60cc139..64649f8e 100644
@@ -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)
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Dan Carpenter

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

---
I would appreciate a little review here. This patch doesn't change behavior, but it's possible that we had intended to do something else.

No, it makes sense to switch it to -EINVAL. Thanks.

#2 lore raw
In reply to Dan Carpenter
Quoted 15 lines · Dan Carpenter

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

---
I would appreciate a little review here. This patch doesn't change behavior, but it's possible that we had intended to do something else.

fs/btrfs/extent-tree.c +0 -0
index 60cc139..64649f8e 100644

fs/btrfs/extent-tree.c int btrfs_init_space_info(struct btrfs_fs_info *fs_info) · line 10589

Quoted 5 lines
fs/btrfs/extent-tree.c +1 -1
@@ -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;

Thank you for this, Dan.

While we're here, I'd suggest to remove this check as tree_root->node has already been readed from btrfs_super_root().

Thanks,

-liubo

Quoted 3 lines
fs/btrfs/extent-tree.c +0 -0
 	features = btrfs_super_incompat_flags(disk_super);
 	if (features & BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS)