diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2019-10-15 18:42:21 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-11-18 17:51:47 +0100 |
| commit | 336a0d8df1d9ec2480dc1790f0d7801c32318d1c (patch) | |
| tree | 05019a0c4d0a10329e4d1f7bc99a74b06aa01b69 /fs/btrfs | |
| parent | b8522a1e5f421e003a8d2a8937eb3a095ce33f5d (diff) | |
| download | linux-336a0d8df1d9ec2480dc1790f0d7801c32318d1c.tar.gz | |
btrfs: Don't use objectid_mutex during mount
Since the filesystem is not well formed and no trees are loaded it's pointless holding the objectid_mutex. Just remove its usage. Signed-off-by: Nikolay Borisov <nborisov@suse.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/disk-io.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 1b1f051ef33f..b23c9fbc2e89 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2666,17 +2666,18 @@ int __cold init_tree_roots(struct btrfs_fs_info *fs_info) tree_root->commit_root = btrfs_root_node(tree_root); btrfs_set_root_refs(&tree_root->root_item, 1); - mutex_lock(&tree_root->objectid_mutex); + /* + * No need to hold btrfs_root::objectid_mutex since the fs + * hasn't been fully initialised and we are the only user + */ ret = btrfs_find_highest_objectid(tree_root, &tree_root->highest_objectid); if (ret < 0) { - mutex_unlock(&tree_root->objectid_mutex); handle_error = true; continue; } ASSERT(tree_root->highest_objectid <= BTRFS_LAST_FREE_OBJECTID); - mutex_unlock(&tree_root->objectid_mutex); ret = btrfs_read_roots(fs_info); if (ret < 0) { |