Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5194e34 authored by David Sterba's avatar David Sterba
Browse files

btrfs: lift uuid_mutex to callers of btrfs_open_devices 



Prepartory work to fix race between mount and device scan.

The callers will have to manage the critical section, eg. mount wants to
scan and then call btrfs_open_devices without the ioctl scan walking in
and modifying the fs devices in the meantime.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 899f9307

fs/btrfs/super.c

+2 −0
Original line number Diff line number Diff line
@@ -1567,7 +1567,9 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, 
		goto error_fs_info;

	}



	mutex_lock(&uuid_mutex);

	error = btrfs_open_devices(fs_devices, mode, fs_type);

	mutex_unlock(&uuid_mutex);

	if (error)

		goto error_fs_info;

fs/btrfs/volumes.c

+2 −2
Original line number Diff line number Diff line
@@ -1142,7 +1142,8 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, 
{

	int ret;



	mutex_lock(&uuid_mutex);

	lockdep_assert_held(&uuid_mutex);



	mutex_lock(&fs_devices->device_list_mutex);

	if (fs_devices->opened) {

		fs_devices->opened++;
@@ -1152,7 +1153,6 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, 
		ret = open_fs_devices(fs_devices, flags, holder);

	}

	mutex_unlock(&fs_devices->device_list_mutex);

	mutex_unlock(&uuid_mutex);



	return ret;

}