diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2011-10-19 21:06:20 (GMT) |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2011-10-20 16:20:57 (GMT) |
| commit | 20bcd64934e4eb8f3f90a0dca54fb0ac2edd7795 (patch) | |
| tree | b3f9d79be8f78ddfec4ab4e2c2aefd27916fd26a | |
| parent | 5f524444c351e145a5f7e28253594688a421bfe8 (diff) | |
| download | linux-20bcd64934e4eb8f3f90a0dca54fb0ac2edd7795.tar.xz | |
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>
| -rw-r--r-- | fs/btrfs/volumes.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index e138af7..c6938b4 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -597,10 +597,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); @@ -655,7 +653,7 @@ error: continue; } if (fs_devices->open_devices == 0) { - ret = -EIO; + ret = -EINVAL; goto out; } fs_devices->seeding = seeding; |