diff options
| author | Anand Jain <anand.jain@oracle.com> | 2018-04-12 10:29:24 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-04-16 21:34:10 +0200 |
| commit | ccb971e509825ed01f2f029b38dc91ba8eb3cb7b (patch) | |
| tree | b745df39b41c3d18f7795d230568e616afdc0ca7 /fs/btrfs | |
| parent | 5d41be6f702f19f72db816c17175caf9dbdcdfa6 (diff) | |
| download | linux-next-ccb971e509825ed01f2f029b38dc91ba8eb3cb7b.tar.gz | |
btrfs: optimize move uuid_mutex closer to the critical section
Move uuid_mutex closer to the exclusion section.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/volumes.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 292266f6ab9c..97b1766b60d0 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1201,31 +1201,29 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, */ bytenr = btrfs_sb_offset(0); flags |= FMODE_EXCL; - mutex_lock(&uuid_mutex); bdev = blkdev_get_by_path(path, flags, holder); - if (IS_ERR(bdev)) { - ret = PTR_ERR(bdev); - goto error; - } + if (IS_ERR(bdev)) + return PTR_ERR(bdev); if (btrfs_read_disk_super(bdev, bytenr, &page, &disk_super)) { ret = -EINVAL; goto error_bdev_put; } + mutex_lock(&uuid_mutex); device = device_list_add(path, disk_super); if (IS_ERR(device)) ret = PTR_ERR(device); else *fs_devices_ret = device->fs_devices; + mutex_unlock(&uuid_mutex); btrfs_release_disk_super(page); error_bdev_put: blkdev_put(bdev, flags); -error: - mutex_unlock(&uuid_mutex); + return ret; } |