X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=fs%2Fbtrfs%2Fvolumes.c;h=5aa52ee5c25e63e892801dcb17f1272ce7177651;hb=f63e0cca9174dd8b47380f61565ab7b921d6ac2c;hp=0d7ab7eab2a2c63f2888339de1c8708a88a9d706;hpb=e4100d987b2437596ebcf11809022b79507f3db1;p=firefly-linux-kernel-4.4.55.git

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 0d7ab7eab2a2..5aa52ee5c25e 100644
--- a/fs/btrfs/volumes.c
+++ b/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;