Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7a3f7ca authored by Sage Weil's avatar Sage Weil Committed by Chris Mason
Browse files

Btrfs: fail mount on bad mount options 



We shouldn't silently ignore unrecognized options.

Signed-off-by: default avatarSage Weil <sage@newdream.net>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 06b2331f

fs/btrfs/super.c

+8 −1
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
	substring_t args[MAX_OPT_ARGS];

	char *p, *num;

	int intarg;

	int ret = 0;



	if (!options)

		return 0;
@@ -262,12 +263,18 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) 
		case Opt_discard:

			btrfs_set_opt(info->mount_opt, DISCARD);

			break;

		case Opt_err:

			printk(KERN_INFO "btrfs: unrecognized mount option "

			       "'%s'\n", p);

			ret = -EINVAL;

			goto out;

		default:

			break;

		}

	}

out:

	kfree(options);

	return 0;

	return ret;

}



/*