Commit ceb21a8d authored by David Sterba's avatar David Sterba

btrfs: reada: reorder dev-replace locks before radix tree preload

The device-replace read lock is going to use rw semaphore in followup
commits. The semaphore might sleep which is not possible in the radix
tree preload section. The lock nesting is now:

* device replace
  * radix tree preload
    * readahead spinlock
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d1051d6e
...@@ -376,26 +376,28 @@ static struct reada_extent *reada_find_extent(struct btrfs_fs_info *fs_info, ...@@ -376,26 +376,28 @@ static struct reada_extent *reada_find_extent(struct btrfs_fs_info *fs_info,
goto error; goto error;
} }
/* Insert extent in reada tree + all per-device trees, all or nothing */
btrfs_dev_replace_read_lock(&fs_info->dev_replace);
ret = radix_tree_preload(GFP_KERNEL); ret = radix_tree_preload(GFP_KERNEL);
if (ret) if (ret) {
btrfs_dev_replace_read_unlock(&fs_info->dev_replace);
goto error; goto error;
}
/* insert extent in reada_tree + all per-device trees, all or nothing */
btrfs_dev_replace_read_lock(&fs_info->dev_replace);
spin_lock(&fs_info->reada_lock); spin_lock(&fs_info->reada_lock);
ret = radix_tree_insert(&fs_info->reada_tree, index, re); ret = radix_tree_insert(&fs_info->reada_tree, index, re);
if (ret == -EEXIST) { if (ret == -EEXIST) {
re_exist = radix_tree_lookup(&fs_info->reada_tree, index); re_exist = radix_tree_lookup(&fs_info->reada_tree, index);
re_exist->refcnt++; re_exist->refcnt++;
spin_unlock(&fs_info->reada_lock); spin_unlock(&fs_info->reada_lock);
btrfs_dev_replace_read_unlock(&fs_info->dev_replace);
radix_tree_preload_end(); radix_tree_preload_end();
btrfs_dev_replace_read_unlock(&fs_info->dev_replace);
goto error; goto error;
} }
if (ret) { if (ret) {
spin_unlock(&fs_info->reada_lock); spin_unlock(&fs_info->reada_lock);
btrfs_dev_replace_read_unlock(&fs_info->dev_replace);
radix_tree_preload_end(); radix_tree_preload_end();
btrfs_dev_replace_read_unlock(&fs_info->dev_replace);
goto error; goto error;
} }
radix_tree_preload_end(); radix_tree_preload_end();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment