2023-11-29 12:01:33

by Arnd Bergmann

Subject: [PATCH] btrfs: fix btrfs_parse_param() build failure

From: Arnd Bergmann <[email protected]>

With CONFIG_BTRFS_FS_POSIX_ACL disabled, the newly added function fails
to build because of an apparent broken rebase:

fs/btrfs/super.c: In function 'btrfs_parse_param':
fs/btrfs/super.c:416:25: error: 'ret' undeclared (first use in this function); did you mean 'net'?
416 | ret = -EINVAL;
| ^~~

Just return the error directly here instead of the incorrect unwinding.

Fixes: a7293bf27082 ("btrfs: add parse_param callback for the new mount api")
Reported-by: Linux Kernel Functional Testing <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
fs/btrfs/super.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 59fe4ffce6e7..022179a05d76 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -413,8 +413,7 @@ static int btrfs_parse_param(struct fs_context *fc,
fc->sb_flags |= SB_POSIXACL;
#else
btrfs_err(NULL, "support for ACL not compiled in!");
- ret = -EINVAL;
- goto out;
+ return -EINVAL;
#endif
}
/*
--
2.39.2

2023-11-29 12:03:09

by David Sterba

Subject: Re: [PATCH] btrfs: fix btrfs_parse_param() build failure

On Wed, Nov 29, 2023 at 01:00:29PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> With CONFIG_BTRFS_FS_POSIX_ACL disabled, the newly added function fails
> to build because of an apparent broken rebase:
>
> fs/btrfs/super.c: In function 'btrfs_parse_param':
> fs/btrfs/super.c:416:25: error: 'ret' undeclared (first use in this function); did you mean 'net'?
> 416 | ret = -EINVAL;
> | ^~~
>
> Just return the error directly here instead of the incorrect unwinding.
>
> Fixes: a7293bf27082 ("btrfs: add parse_param callback for the new mount api")
> Reported-by: Linux Kernel Functional Testing <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>

Should be fixed in today's for-next snapshot, thanks.