[PATCH 01/15] btrfs: optimize move uuid_mutex closer to the critical section

[Anand Jain]

Move uuid_mutex closer to the exclusion section.

Signed-off-by: Anand Jain <anand.j...@oracle.com>
Reviewed-by: David Sterba <dste...@suse.com>
---
 fs/btrfs/volumes.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 1d9f20fc3392..7ccd1a38c634 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1206,31 +1206,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;
 }
 
-- 
2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html