From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 19 Oct 2011 21:06:20 +0000 (+0300)
Subject: Btrfs: close all bdevs on mount failure
X-Git-Tag: v2.6.39-400.9.0~845^2~38
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7e0bd4fa758afb0f166c922e9351eaf710daac43;p=users%2Fjedix%2Flinux-maple.git

Btrfs: close all bdevs on mount failure

Fix a bug introduced by 20b45077.  We have to return EINVAL on mount
failure, but doing that too early in the sequence leaves all of the
devices opened exclusively.  This also fixes an issue where under some
scenarios only a second mount -o degraded <devices> command would
succeed.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 20bcd64934e4eb8f3f90a0dca54fb0ac2edd7795)
---

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 031e7dc3927d..068beed5aed9 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -605,10 +605,8 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
 		set_blocksize(bdev, 4096);
 
 		bh = btrfs_read_dev_super(bdev);
-		if (!bh) {
-			ret = -EINVAL;
+		if (!bh)
 			goto error_close;
-		}
 
 		disk_super = (struct btrfs_super_block *)bh->b_data;
 		devid = btrfs_stack_device_id(&disk_super->dev_item);
@@ -663,7 +661,7 @@ error:
 		continue;
 	}
 	if (fs_devices->open_devices == 0) {
-		ret = -EIO;
+		ret = -EINVAL;
 		goto out;
 	}
 	fs_devices->seeding = seeding;