Merge tag 'pull-ufs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

torvalds · torvalds · commit 01a412d06bc5 · 2025-07-23T08:53:38.000-07:00
Pull ufs fix from Al Viro:
 "Fix regression in ufs options parsing"

* tag 'pull-ufs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix the regression in ufs options parsing
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
@@ -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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ static int ufs_parse_param(struct fs_context fc, struct fs_parameter param)`
`397`	`397`	`pr_err("ufstype can't be changed during remount\n");`
`398`	`398`	`return -EINVAL;`
`399`	`399`	`}`
`400`		`- if (!ctx->flavour) {`
	`400`	`+ if (ctx->flavour) {`
`401`	`401`	`pr_err("conflicting ufstype options\n");`
`402`	`402`	`return -EINVAL;`
`403`	`403`	`}`