* Re: [PATCH] btrfs: fix btrfs_parse_param() build failure
2023-11-29 12:00 [PATCH] btrfs: fix btrfs_parse_param() build failure Arnd Bergmann
@ 2023-11-29 11:55 ` David Sterba
0 siblings, 0 replies; 2+ messages in thread
From: David Sterba @ 2023-11-29 11:55 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Chris Mason, Josef Bacik, David Sterba, Arnd Bergmann,
Linux Kernel Functional Testing, Johannes Thumshirn, Qu Wenruo,
Anand Jain, linux-btrfs, linux-kernel
On Wed, Nov 29, 2023 at 01:00:29PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> 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 <lkft@linaro.org>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Should be fixed in today's for-next snapshot, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] btrfs: fix btrfs_parse_param() build failure
@ 2023-11-29 12:00 Arnd Bergmann
2023-11-29 11:55 ` David Sterba
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2023-11-29 12:00 UTC (permalink / raw)
To: Chris Mason, Josef Bacik, David Sterba
Cc: Arnd Bergmann, Linux Kernel Functional Testing,
Johannes Thumshirn, Qu Wenruo, Anand Jain, linux-btrfs,
linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
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 <lkft@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-29 12:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-29 12:00 [PATCH] btrfs: fix btrfs_parse_param() build failure Arnd Bergmann
2023-11-29 11:55 ` David Sterba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox