From 51c718d0b7cc68be5c7a37faf36bc1e3a1741e81 Mon Sep 17 00:00:00 2001
From: Eric Sandeen <sandeen@redhat.com>
Date: Thu, 4 Apr 2013 20:45:08 +0000
Subject: [PATCH] --- yaml --- r: 374852 b: refs/heads/master c:
 f63e0cca9174dd8b47380f61565ab7b921d6ac2c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e81971b46569..d8f252f9d7ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4100d987b2437596ebcf11809022b79507f3db1
+refs/heads/master: f63e0cca9174dd8b47380f61565ab7b921d6ac2c
diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c
index 0d7ab7eab2a2..5aa52ee5c25e 100644
--- a/trunk/fs/btrfs/volumes.c
+++ b/trunk/fs/btrfs/volumes.c
@@ -717,9 +717,9 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
 		if (!device->name)
 			continue;
 
-		ret = btrfs_get_bdev_and_sb(device->name->str, flags, holder, 1,
-					    &bdev, &bh);
-		if (ret)
+		/* Just open everything we can; ignore failures here */
+		if (btrfs_get_bdev_and_sb(device->name->str, flags, holder, 1,
+					    &bdev, &bh))
 			continue;
 
 		disk_super = (struct btrfs_super_block *)bh->b_data;