diff --git a/[refs] b/[refs]
index 3a5539cd7004..352cf2dd451d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb099670895f22970cd143875467c2768d6d87e5
+refs/heads/master: b288052e1779261ae80138074989ef50358c4e58
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index f3fd7e2cbc38..66b8341e2dba 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/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;