浏览代码

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>
Qu Wenruo 7 年之前
父节点
当前提交
5e23a6fea6
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      fs/btrfs/extent-tree.c

+ 1 - 2
fs/btrfs/extent-tree.c

@@ -7564,7 +7564,7 @@ unclustered_alloc:
 			goto loop;
 			goto loop;
 		}
 		}
 checks:
 checks:
-		search_start = ALIGN(offset, fs_info->stripesize);
+		search_start = round_up(offset, fs_info->stripesize);
 
 
 		/* move on to the next group */
 		/* move on to the next group */
 		if (search_start + num_bytes >
 		if (search_start + num_bytes >
@@ -7576,7 +7576,6 @@ checks:
 		if (offset < search_start)
 		if (offset < search_start)
 			btrfs_add_free_space(block_group, offset,
 			btrfs_add_free_space(block_group, offset,
 					     search_start - offset);
 					     search_start - offset);
-		BUG_ON(offset > search_start);
 
 
 		ret = btrfs_add_reserved_bytes(block_group, ram_bytes,
 		ret = btrfs_add_reserved_bytes(block_group, ram_bytes,
 				num_bytes, delalloc);
 				num_bytes, delalloc);