Skip to content

Commit

Permalink
Btrfs: Off by one fixes for extent-tree.c
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Mason <[email protected]>
  • Loading branch information
ukernel authored and chrismason-xx committed Sep 25, 2008
1 parent 5e5745d commit 5cf6642
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions fs/btrfs/extent-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,9 @@ struct btrfs_block_group_cache *btrfs_lookup_block_group(struct
return NULL;

block_group = (struct btrfs_block_group_cache *)(unsigned long)ptr;


if (block_group->key.objectid <= bytenr && bytenr <=
if (block_group->key.objectid <= bytenr && bytenr <
block_group->key.objectid + block_group->key.offset)
return block_group;

return NULL;
}
static u64 find_search_start(struct btrfs_root *root,
Expand Down Expand Up @@ -195,7 +192,7 @@ static u64 find_search_start(struct btrfs_root *root,
continue;
}
if (data != BTRFS_BLOCK_GROUP_MIXED &&
start + num >= cache->key.objectid + cache->key.offset)
start + num > cache->key.objectid + cache->key.offset)
goto new_group;
return start;
}
Expand Down Expand Up @@ -1088,9 +1085,8 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root

if (ins->objectid + num_bytes >= search_end)
goto enospc;

if (!full_scan && data != BTRFS_BLOCK_GROUP_MIXED &&
ins->objectid + num_bytes >= block_group->
ins->objectid + num_bytes > block_group->
key.objectid + block_group->key.offset) {
search_start = block_group->key.objectid +
block_group->key.offset;
Expand Down

0 comments on commit 5cf6642

Please sign in to comment.