Btrfs: Off by one fixes for extent-tree.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index e534067..6a7a9ba 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -150,12 +150,9 @@
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,
@@ -195,7 +192,7 @@
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;
}
@@ -1088,9 +1085,8 @@
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;