From 0b2a5529110d469b6955bbf49e56e22483629099 Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 8 Nov 2011 19:15:05 +0200
Subject: [PATCH] --- yaml --- r: 275317 b: refs/heads/master c:
 f23c8af8ca2789eeb0ab9ea90c214f9694d96cc5 h: refs/heads/master i:   275315:
 e3f503baff8bd0491aca8aef35cfd40a606009c9 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/super.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5ccf1b52f63b..0644167792e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a90e8b6fb80db43b029e1e76205452afa8bdc77a
+refs/heads/master: f23c8af8ca2789eeb0ab9ea90c214f9694d96cc5
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
index 6befcaf253bd..58e9492230ce 100644
--- a/trunk/fs/btrfs/super.c
+++ b/trunk/fs/btrfs/super.c
@@ -905,8 +905,10 @@ static struct dentry *btrfs_mount(struct file_system_type *fs_type, int flags,
 	error = btrfs_parse_early_options(data, mode, fs_type,
 					  &subvol_name, &subvol_objectid,
 					  &subvol_rootid, &fs_devices);
-	if (error)
+	if (error) {
+		kfree(subvol_name);
 		return ERR_PTR(error);
+	}
 
 	if (subvol_name) {
 		root = mount_subvol(subvol_name, flags, device_name, data);