diff --git a/[refs] b/[refs] index 1bda6133b16f..790c0dc5fb2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f524444c351e145a5f7e28253594688a421bfe8 +refs/heads/master: 20bcd64934e4eb8f3f90a0dca54fb0ac2edd7795 diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c index e138af710de2..c6938b45e0fd 100644 --- a/trunk/fs/btrfs/volumes.c +++ b/trunk/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 @@ static int __btrfs_open_devices(struct btrfs_fs_devices *fs_devices, continue; } if (fs_devices->open_devices == 0) { - ret = -EIO; + ret = -EINVAL; goto out; } fs_devices->seeding = seeding;