diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-05-20 15:42:24 +0100 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-05-20 15:42:24 +0100 |
| commit | 304f215abb836811e6d78e0a3da53d48aa0e7ca7 (patch) | |
| tree | efdecffd52c35757d962965f89805721a47e7fec /rbtree.h | |
| parent | aab0fcb8ae7386475598fd2bef887cf0f9f3b65a (diff) | |
| parent | ad5f1f2d34cbb2f235ff3c1bc7dd28450759b2c7 (diff) | |
| download | btrfs-progs-baserock/morph.tar.gz | |
Merge branch 'baserock/tiagogomes/btrfs2' into baserock/morphbaserock/morph
Diffstat (limited to 'rbtree.h')
| -rw-r--r-- | rbtree.h | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -93,7 +93,11 @@ static inline struct page * rb_insert_page_cache(struct inode * inode, #ifndef _LINUX_RBTREE_H #define _LINUX_RBTREE_H +#if BTRFS_FLAT_INCLUDES #include "kerncompat.h" +#else +#include <btrfs/kerncompat.h> +#endif /* BTRFS_FLAT_INCLUDES */ struct rb_node { unsigned long rb_parent_color; @@ -145,7 +149,7 @@ extern struct rb_node *rb_first(struct rb_root *); extern struct rb_node *rb_last(struct rb_root *); /* Fast replacement of a single node without remove/rebalance/add/rebalance */ -extern void rb_replace_node(struct rb_node *victim, struct rb_node *new, +extern void rb_replace_node(struct rb_node *victim, struct rb_node *xnew, struct rb_root *root); static inline void rb_link_node(struct rb_node * node, struct rb_node * parent, |