btrfs: use lockdep_assert_held for mutexes
Using lockdep_assert_held is preferred, replace mutex_is_locked. Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
a4666e688f
commit
a32bf9a302
|
@ -4545,7 +4545,7 @@ void check_system_chunk(struct btrfs_trans_handle *trans,
|
||||||
* Needed because we can end up allocating a system chunk and for an
|
* Needed because we can end up allocating a system chunk and for an
|
||||||
* atomic and race free space reservation in the chunk block reserve.
|
* atomic and race free space reservation in the chunk block reserve.
|
||||||
*/
|
*/
|
||||||
ASSERT(mutex_is_locked(&fs_info->chunk_mutex));
|
lockdep_assert_held(&fs_info->chunk_mutex);
|
||||||
|
|
||||||
info = __find_space_info(fs_info, BTRFS_BLOCK_GROUP_SYSTEM);
|
info = __find_space_info(fs_info, BTRFS_BLOCK_GROUP_SYSTEM);
|
||||||
spin_lock(&info->lock);
|
spin_lock(&info->lock);
|
||||||
|
|
|
@ -371,7 +371,7 @@ static struct full_stripe_lock *insert_full_stripe_lock(
|
||||||
struct full_stripe_lock *entry;
|
struct full_stripe_lock *entry;
|
||||||
struct full_stripe_lock *ret;
|
struct full_stripe_lock *ret;
|
||||||
|
|
||||||
WARN_ON(!mutex_is_locked(&locks_root->lock));
|
lockdep_assert_held(&locks_root->lock);
|
||||||
|
|
||||||
p = &locks_root->root.rb_node;
|
p = &locks_root->root.rb_node;
|
||||||
while (*p) {
|
while (*p) {
|
||||||
|
@ -413,7 +413,7 @@ static struct full_stripe_lock *search_full_stripe_lock(
|
||||||
struct rb_node *node;
|
struct rb_node *node;
|
||||||
struct full_stripe_lock *entry;
|
struct full_stripe_lock *entry;
|
||||||
|
|
||||||
WARN_ON(!mutex_is_locked(&locks_root->lock));
|
lockdep_assert_held(&locks_root->lock);
|
||||||
|
|
||||||
node = locks_root->root.rb_node;
|
node = locks_root->root.rb_node;
|
||||||
while (node) {
|
while (node) {
|
||||||
|
|
|
@ -2067,7 +2067,7 @@ void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_fs_info *fs_info,
|
||||||
{
|
{
|
||||||
struct btrfs_fs_devices *fs_devices;
|
struct btrfs_fs_devices *fs_devices;
|
||||||
|
|
||||||
WARN_ON(!mutex_is_locked(&fs_info->fs_devices->device_list_mutex));
|
lockdep_assert_held(&fs_info->fs_devices->device_list_mutex);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* in case of fs with no seed, srcdev->fs_devices will point
|
* in case of fs with no seed, srcdev->fs_devices will point
|
||||||
|
@ -2257,7 +2257,7 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info)
|
||||||
struct btrfs_device *device;
|
struct btrfs_device *device;
|
||||||
u64 super_flags;
|
u64 super_flags;
|
||||||
|
|
||||||
BUG_ON(!mutex_is_locked(&uuid_mutex));
|
lockdep_assert_held(&uuid_mutex);
|
||||||
if (!fs_devices->seeding)
|
if (!fs_devices->seeding)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
@ -2990,7 +2990,7 @@ static int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset)
|
||||||
* we release the path used to search the chunk/dev tree and before
|
* we release the path used to search the chunk/dev tree and before
|
||||||
* the current task acquires this mutex and calls us.
|
* the current task acquires this mutex and calls us.
|
||||||
*/
|
*/
|
||||||
ASSERT(mutex_is_locked(&fs_info->delete_unused_bgs_mutex));
|
lockdep_assert_held(&fs_info->delete_unused_bgs_mutex);
|
||||||
|
|
||||||
ret = btrfs_can_relocate(fs_info, chunk_offset);
|
ret = btrfs_can_relocate(fs_info, chunk_offset);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -5100,7 +5100,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
|
||||||
{
|
{
|
||||||
u64 chunk_offset;
|
u64 chunk_offset;
|
||||||
|
|
||||||
ASSERT(mutex_is_locked(&fs_info->chunk_mutex));
|
lockdep_assert_held(&fs_info->chunk_mutex);
|
||||||
chunk_offset = find_next_chunk(fs_info);
|
chunk_offset = find_next_chunk(fs_info);
|
||||||
return __btrfs_alloc_chunk(trans, chunk_offset, type);
|
return __btrfs_alloc_chunk(trans, chunk_offset, type);
|
||||||
}
|
}
|
||||||
|
@ -6658,7 +6658,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info,
|
||||||
struct btrfs_fs_devices *fs_devices;
|
struct btrfs_fs_devices *fs_devices;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
BUG_ON(!mutex_is_locked(&uuid_mutex));
|
lockdep_assert_held(&uuid_mutex);
|
||||||
ASSERT(fsid);
|
ASSERT(fsid);
|
||||||
|
|
||||||
fs_devices = fs_info->fs_devices->seed;
|
fs_devices = fs_info->fs_devices->seed;
|
||||||
|
|
Loading…
Reference in a new issue