Btrfs: clean up an error code in btrfs_init_space_info()
Subsystems (2)
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.
---
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
@@ -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 )
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')Signed-off-by Dan Carpenter <[email protected]>---
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.
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')Signed-off-by Dan Carpenter <[email protected]>---
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
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
-0features =btrfs_super_incompat_flags (disk_super);if (features &BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS )