From 4d968860c7cd0c9800cbb96aa500d0cfb5d003d3 Mon Sep 17 00:00:00 2001
From: Arne Jansen <sensille@gmx.net>
Date: Mon, 30 May 2011 08:36:16 +0000
Subject: [PATCH] --- yaml --- r: 253095 b: refs/heads/master c:
 5f3f302a6f4cb74906c05fad1d03fc5e95c7e5af h: refs/heads/master i:   253093:
 4977deb3404e3ef4516a9f550cade49aec7fb696   253091:
 941ac637688bb2be99990ae17465721c4f878dd5   253087:
 7e2269509d928bb77888844ac078c8333f78d14f v: v3

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

diff --git a/[refs] b/[refs]
index 1b9f4649c800..1b7fb92a42fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca456ae280c0646e1e571c3b9a3834c55e90adfe
+refs/heads/master: 5f3f302a6f4cb74906c05fad1d03fc5e95c7e5af
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
index c48214ef5c09..da541dfca2e3 100644
--- a/trunk/fs/btrfs/volumes.c
+++ b/trunk/fs/btrfs/volumes.c
@@ -504,7 +504,7 @@ static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices)
 		BUG_ON(!new_device);
 		memcpy(new_device, device, sizeof(*new_device));
 		new_device->name = kstrdup(device->name, GFP_NOFS);
-		BUG_ON(!new_device->name);
+		BUG_ON(device->name && !new_device->name);
 		new_device->bdev = NULL;
 		new_device->writeable = 0;
 		new_device->in_fs_metadata = 0;