---

yaml --- r: 275317 b: refs/heads/master c: f23c8af h: refs/heads/master i: 275315: e3f503b v: v3
git-mirror · Nov 9, 2011 · 0b2a552 · 0b2a552
1 parent 9db2bfa
commit 0b2a552
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);