diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 23:51:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 23:51:22 +0200 |
| commit | 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 (patch) | |
| tree | e7be2cf442626316b6b6fb212960fe1f77ff2725 /fs/jffs2/nodelist.h | |
| parent | Merge git://git.infradead.org/mtd-2.6 (diff) | |
| parent | [RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency (diff) | |
| download | linux-2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6.tar.xz linux-2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6.zip | |
Merge git://git.infradead.org/~dwmw2/rbtree-2.6
* git://git.infradead.org/~dwmw2/rbtree-2.6:
[RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency
Update UML kernel/physmem.c to use rb_parent() accessor macro
[RBTREE] Update hrtimers to use rb_parent() accessor macro.
[RBTREE] Add explicit alignment to sizeof(long) for struct rb_node.
[RBTREE] Merge colour and parent fields of struct rb_node.
[RBTREE] Remove dead code in rb_erase()
[RBTREE] Update JFFS2 to use rb_parent() accessor macro.
[RBTREE] Update eventpoll.c to use rb_parent() accessor macro.
[RBTREE] Update key.c to use rb_parent() accessor macro.
[RBTREE] Update ext3 to use rb_parent() accessor macro.
[RBTREE] Change rbtree off-tree marking in I/O schedulers.
[RBTREE] Add accessor macros for colour and parent fields of rb_node
Diffstat (limited to 'fs/jffs2/nodelist.h')
| -rw-r--r-- | fs/jffs2/nodelist.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h index 7ad8ee043880..b16c60bbcf6e 100644 --- a/fs/jffs2/nodelist.h +++ b/fs/jffs2/nodelist.h @@ -315,7 +315,6 @@ static inline struct jffs2_node_frag *frag_last(struct rb_root *root) return rb_entry(node, struct jffs2_node_frag, rb); } -#define rb_parent(rb) ((rb)->rb_parent) #define frag_next(frag) rb_entry(rb_next(&(frag)->rb), struct jffs2_node_frag, rb) #define frag_prev(frag) rb_entry(rb_prev(&(frag)->rb), struct jffs2_node_frag, rb) #define frag_parent(frag) rb_entry(rb_parent(&(frag)->rb), struct jffs2_node_frag, rb) |