Commit 5e23a6fe authored Jul 23, 2018 by Qu Wenruo Committed by David Sterba Aug 06, 2018

btrfs: extent-tree: Remove dead alignment check



In find_free_extent() under checks: label, we have the following code:

		search_start = ALIGN(offset, fs_info->stripesize);
		/* move on to the next group */
		if (search_start + num_bytes >
		    block_group->key.objectid + block_group->key.offset) {
			btrfs_add_free_space(block_group, offset, num_bytes);
			goto loop;
		}
		if (offset < search_start)
			btrfs_add_free_space(block_group, offset,
					     search_start - offset);
		BUG_ON(offset > search_start);

However ALIGN() is rounding up, thus @search_start >= @offset and that
BUG_ON() will never be triggered.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent ca5d2ba1

fs/btrfs/extent-tree.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -7564,7 +7564,7 @@ unclustered_alloc:
		goto loop;
		}
		checks:
		search_start = ALIGN(offset, fs_info->stripesize);
		search_start = round_up(offset, fs_info->stripesize);

		/* move on to the next group */
		if (search_start + num_bytes >
		@@ -7576,7 +7576,6 @@ checks:
		if (offset < search_start)
		btrfs_add_free_space(block_group, offset,
		search_start - offset);
		BUG_ON(offset > search_start);

		ret = btrfs_add_reserved_bytes(block_group, ram_bytes,
		num_bytes, delalloc);

Admin message