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

01a412d0 · Linus Torvalds <[email protected]> · 2025-07-23 08:53:38 -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

Commit: 01a412d06bc5786eb4e44a6c8f0f4659bd4c9864
Parents: 964ebc07 · e09a335a

Merge commit. Changes below are compared with the first parent: 964ebc07.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/ufs/super.c	modified	+1	−1	View file

fs/ufs/super.c

View file

diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index eea718a..6e45851 100644
--- 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;
 		}