diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index f3fd7e2cbc383aaefd42be70a02f80c759b6979b..66b8341e2dbac695fb7b649839bf61b08c9ec8d7 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -511,6 +511,10 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data)
 	struct btrfs_root *root = btrfs_sb(sb);
 	int ret;
 
+	ret = btrfs_parse_options(root, data);
+	if (ret)
+		return -EINVAL;
+
 	if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
 		return 0;