]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
fix the regression in ufs options parsing
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 20 Jul 2025 20:43:53 +0000 (16:43 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 23 Jul 2025 15:45:04 +0000 (11:45 -0400)
A really dumb braino on rebasing and a dumber fuckup with managing #for-next

Fixes: b70cb459890b ("ufs: convert ufs to the new mount API")
Fucked-up-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/ufs/super.c

index eea718ac66b4fdbdc1c3c1839e06ee1d046a2284..6e4585169f94bb9652aac29a14b0a64a7bb710d8 100644 (file)
@@ -397,7 +397,7 @@ static int ufs_parse_param(struct fs_context *fc, struct fs_parameter *param)
                        pr_err("ufstype can't be changed during remount\n");
                        return -EINVAL;
                }
-                if (!ctx->flavour) {
+                if (ctx->flavour) {
                        pr_err("conflicting ufstype options\n");
                        return -EINVAL;
                }