Commit 01a412d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 964ebc07 e09a335a

fs/ufs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}