Commit 3c14874a authored by Josef Bacik's avatar Josef Bacik Committed by Chris Mason
Browse files

Btrfs: exclude super blocks when we read in block groups 



This has been resulting in a BUT_ON(ret) after btrfs_reserve_extent in
btrfs_cow_file_range.  The reason is we don't actually calculate the bytes_super
for a block group until we go to cache it, which means that the space_info can
hand out reservations for space that it doesn't actually have, and we can run
out of data space.  This is also a problem if you are using space caching since
we don't ever calculate bytes_super for the block groups.  So instead everytime
we read a block group call exclude_super_stripes, which calculates the
bytes_super for the block group so it can be left out of the space_info.  Then
whenever caching completes we just call free_excluded_extents so that the super
excluded extents are freed up.  Also if we are unmounting and we hit any block
groups that haven't been cached we still need to call free_excluded_extents to
make sure things are cleaned up properly.  Thanks,

Reported-by: default avatarArne Jansen <sensille@gmx.net>
Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 13dbc089

fs/btrfs/extent-tree.c

+18 −8
Original line number Diff line number Diff line
@@ -320,11 +320,6 @@ static int caching_kthread(void *data) 
	if (!path)

		return -ENOMEM;



	exclude_super_stripes(extent_root, block_group);

	spin_lock(&block_group->space_info->lock);

	block_group->space_info->bytes_readonly += block_group->bytes_super;

	spin_unlock(&block_group->space_info->lock);



	last = max_t(u64, block_group->key.objectid, BTRFS_SUPER_INFO_OFFSET);



	/*
@@ -467,9 +462,11 @@ static int cache_block_group(struct btrfs_block_group_cache *cache, 
			cache->cached = BTRFS_CACHE_NO;

		}

		spin_unlock(&cache->lock);

		if (ret == 1)

		if (ret == 1) {

			free_excluded_extents(fs_info->extent_root, cache);

			return 0;

		}

	}



	if (load_cache_only)

		return 0;
@@ -4036,6 +4033,7 @@ void btrfs_delalloc_release_metadata(struct inode *inode, u64 num_bytes) 


	num_bytes = ALIGN(num_bytes, root->sectorsize);

	atomic_dec(&BTRFS_I(inode)->outstanding_extents);

	WARN_ON(atomic_read(&BTRFS_I(inode)->outstanding_extents) < 0);



	spin_lock(&BTRFS_I(inode)->accounting_lock);

	nr_extents = atomic_read(&BTRFS_I(inode)->outstanding_extents);
@@ -8325,6 +8323,13 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) 
		if (block_group->cached == BTRFS_CACHE_STARTED)

			wait_block_group_cache_done(block_group);



		/*

		 * We haven't cached this block group, which means we could

		 * possibly have excluded extents on this block group.

		 */

		if (block_group->cached == BTRFS_CACHE_NO)

			free_excluded_extents(info->extent_root, block_group);



		btrfs_remove_free_space_cache(block_group);

		btrfs_put_block_group(block_group);
@@ -8439,6 +8444,13 @@ int btrfs_read_block_groups(struct btrfs_root *root) 
		cache->flags = btrfs_block_group_flags(&cache->item);

		cache->sectorsize = root->sectorsize;



		/*

		 * We need to exclude the super stripes now so that the space

		 * info has super bytes accounted for, otherwise we'll think

		 * we have more space than we actually do.

		 */

		exclude_super_stripes(root, cache);



		/*

		 * check for two cases, either we are full, and therefore

		 * don't need to bother with the caching work since we won't
@@ -8447,12 +8459,10 @@ int btrfs_read_block_groups(struct btrfs_root *root) 
		 * time, particularly in the full case.

		 */

		if (found_key.offset == btrfs_block_group_used(&cache->item)) {

			exclude_super_stripes(root, cache);

			cache->last_byte_to_unpin = (u64)-1;

			cache->cached = BTRFS_CACHE_FINISHED;

			free_excluded_extents(root, cache);

		} else if (btrfs_block_group_used(&cache->item) == 0) {

			exclude_super_stripes(root, cache);

			cache->last_byte_to_unpin = (u64)-1;

			cache->cached = BTRFS_CACHE_FINISHED;

			add_new_free_space(cache, root->fs_info,

CRA Git | Maintained and supported by SUSTech CRA and CCSE