Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 180051
b: refs/heads/master
c: b8d9bfe
h: refs/heads/master
i:
  180049: fd9ba98
  180047: ea2331c
v: v3
  • Loading branch information
Miao Xie authored and Chris Mason committed Jan 28, 2010
1 parent 4b38018 commit b3e0504
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a555f810af6d63ea5960abaed88e150ad95c3011
refs/heads/master: b8d9bfeb18f9af794020d96e9bee984d18a8d737
14 changes: 0 additions & 14 deletions trunk/fs/btrfs/extent_map.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,20 +155,6 @@ static struct rb_node *__tree_search(struct rb_root *root, u64 offset,
return NULL;
}

/*
* look for an offset in the tree, and if it can't be found, return
* the first offset we can find smaller than 'offset'.
*/
static inline struct rb_node *tree_search(struct rb_root *root, u64 offset)
{
struct rb_node *prev;
struct rb_node *ret;
ret = __tree_search(root, offset, &prev, NULL);
if (!ret)
return prev;
return ret;
}

/* check to see if two extent_map structs are adjacent and safe to merge */
static int mergable_maps(struct extent_map *prev, struct extent_map *next)
{
Expand Down

0 comments on commit b3e0504

Please sign in to comment.