From 90debc289d8b6bfc9af54823c8cf2408ad9e56bf Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 29 Sep 2009 13:51:04 -0400
Subject: [PATCH] --- yaml --- r: 166679 b: refs/heads/master c:
 fd2696f399e45347c07f1f7f340e8515cace5657 h: refs/heads/master i:   166677:
 0460a9d45774062eb5f22f95663adfa54b7e188a   166675:
 e8164f26178c5d1d8d2b62c90bd66dcc5b295ec1   166671:
 6d9bfdaedd22fc3e57f265997a333f261ffb2545 v: v3

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

diff --git a/[refs] b/[refs]
index ef79ca2886a6..5a523ad89d72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49cf6f4529b7945ef51b8e39f0bac630726f8c96
+refs/heads/master: fd2696f399e45347c07f1f7f340e8515cace5657
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
index be953afe804c..20cbd2eebd97 100644
--- a/trunk/fs/btrfs/volumes.c
+++ b/trunk/fs/btrfs/volumes.c
@@ -446,8 +446,10 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig)
 			goto error;
 
 		device->name = kstrdup(orig_dev->name, GFP_NOFS);
-		if (!device->name)
+		if (!device->name) {
+			kfree(device);
 			goto error;
+		}
 
 		device->devid = orig_dev->devid;
 		device->work.func = pending_bios_fn;