summaryrefslogtreecommitdiff
path: root/fs/ufs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-07-23 08:53:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2025-07-23 08:53:38 -0700
commit01a412d06bc5786eb4e44a6c8f0f4659bd4c9864 (patch)
tree6ae4436557d0cb4f0a178bfb16d1964b3f319190 /fs/ufs
parent964ebc07c546c76b78aea5b6dff0d02c602d4793 (diff)
parente09a335a819133c0a9d6799adcf6d51837a7da2d (diff)
Merge tag 'pull-ufs-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfsHEADmaster
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
Diffstat (limited to 'fs/ufs')
-rw-r--r--fs/ufs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index eea718ac66b4..6e4585169f94 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;
}