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

Commit d2006e6d authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Refactor update_space_info 



Following the factoring out of the creation code udpate_space_info can
only be called for already-existing space_info structs. As such it
cannot fail.  Remove superfluous error handling and make the function
return void.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarJeff Mahoney <jeffm@suse.com>
Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2be12ef7

fs/btrfs/extent-tree.c

+18 −40
Original line number Diff line number Diff line
@@ -3972,7 +3972,7 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags, 
	return ret;

}



static int update_space_info(struct btrfs_fs_info *info, u64 flags,

static void update_space_info(struct btrfs_fs_info *info, u64 flags,

			     u64 total_bytes, u64 bytes_used,

			     u64 bytes_readonly,

			     struct btrfs_space_info **space_info)
@@ -3987,7 +3987,7 @@ static int update_space_info(struct btrfs_fs_info *info, u64 flags, 
		factor = 1;



	found = __find_space_info(info, flags);

	if (found) {

	ASSERT(found);

	spin_lock(&found->lock);

	found->total_bytes += total_bytes;

	found->disk_total += total_bytes * factor;
@@ -4000,8 +4000,6 @@ static int update_space_info(struct btrfs_fs_info *info, u64 flags, 
				 bytes_used - bytes_readonly);

	spin_unlock(&found->lock);

	*space_info = found;

		return 0;

	}

}



static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)
@@ -10078,19 +10076,9 @@ int btrfs_read_block_groups(struct btrfs_fs_info *info) 
		}



		trace_btrfs_add_block_group(info, cache, 0);

		ret = update_space_info(info, cache->flags, found_key.offset,

		update_space_info(info, cache->flags, found_key.offset,

				  btrfs_block_group_used(&cache->item),

				  cache->bytes_super, &space_info);

		if (ret) {

			btrfs_remove_free_space_cache(cache);

			spin_lock(&info->block_group_cache_lock);

			rb_erase(&cache->cache_node,

				 &info->block_group_cache_tree);

			RB_CLEAR_NODE(&cache->cache_node);

			spin_unlock(&info->block_group_cache_lock);

			btrfs_put_block_group(cache);

			goto error;

		}



		cache->space_info = space_info;
@@ -10249,18 +10237,8 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, 
	 * the rbtree, update the space info's counters.

	 */

	trace_btrfs_add_block_group(fs_info, cache, 1);

	ret = update_space_info(fs_info, cache->flags, size, bytes_used,

	update_space_info(fs_info, cache->flags, size, bytes_used,

				cache->bytes_super, &cache->space_info);

	if (ret) {

		btrfs_remove_free_space_cache(cache);

		spin_lock(&fs_info->block_group_cache_lock);

		rb_erase(&cache->cache_node,

			 &fs_info->block_group_cache_tree);

		RB_CLEAR_NODE(&cache->cache_node);

		spin_unlock(&fs_info->block_group_cache_lock);

		btrfs_put_block_group(cache);

		return ret;

	}

	update_global_block_rsv(fs_info);



	__link_block_group(cache->space_info, cache);