mtd/fs/jffs2 nodelist.h,1.85,1.86

[David Woodhouse]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv30409

Modified Files:
	nodelist.h 
Log Message:
more rbtree typedef cleanup

Index: nodelist.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodelist.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- nodelist.h	8 Oct 2002 17:02:17 -0000	1.85
+++ nodelist.h	12 Nov 2002 09:50:45 -0000	1.86
@@ -158,7 +158,7 @@
 */
 struct jffs2_node_frag
 {
-	rb_node_t rb;
+	struct rb_node rb;
 	struct jffs2_full_dnode *node; /* NULL for holes */
 	uint32_t size;
 	uint32_t ofs; /* Don't really need this, but optimisation */
@@ -255,9 +255,9 @@
 	return ((struct jffs2_inode_cache *)raw)->ino;
 }
 
-static inline struct jffs2_node_frag *frag_first(rb_root_t *root)
+static inline struct jffs2_node_frag *frag_first(struct rb_root *root)
 {
-	rb_node_t *node = root->rb_node;
+	struct rb_node *node = root->rb_node;
 
 	if (!node)
 		return NULL;
@@ -286,12 +286,12 @@
 void jffs2_del_ino_cache(struct jffs2_sb_info *c, struct jffs2_inode_cache *old);
 void jffs2_free_ino_caches(struct jffs2_sb_info *c);
 void jffs2_free_raw_node_refs(struct jffs2_sb_info *c);
-struct jffs2_node_frag *jffs2_lookup_node_frag(rb_root_t *fragtree, uint32_t offset);
-void jffs2_kill_fragtree(rb_root_t *root, struct jffs2_sb_info *c_delete);
+struct jffs2_node_frag *jffs2_lookup_node_frag(struct rb_root *fragtree, uint32_t offset);
+void jffs2_kill_fragtree(struct rb_root *root, struct jffs2_sb_info *c_delete);
 void jffs2_fragtree_insert(struct jffs2_node_frag *newfrag, struct jffs2_node_frag *base);
-rb_node_t *rb_next(rb_node_t *);
-rb_node_t *rb_prev(rb_node_t *);
-void rb_replace_node(rb_node_t *victim, rb_node_t *new, rb_root_t *root);
+struct rb_node *rb_next(struct rb_node *);
+struct rb_node *rb_prev(struct rb_node *);
+void rb_replace_node(struct rb_node *victim, struct rb_node *new, struct rb_root *root);
 
 /* nodemgmt.c */
 int jffs2_reserve_space(struct jffs2_sb_info *c, uint32_t minsize, uint32_t *ofs, uint32_t *len, int prio);
@@ -314,8 +314,8 @@
 
 
 /* readinode.c */
-void jffs2_truncate_fraglist (struct jffs2_sb_info *c, rb_root_t *list, uint32_t size);
-int jffs2_add_full_dnode_to_fraglist(struct jffs2_sb_info *c, rb_root_t *list, struct jffs2_full_dnode *fn);
+void jffs2_truncate_fraglist (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size);
+int jffs2_add_full_dnode_to_fraglist(struct jffs2_sb_info *c, struct rb_root *list, struct jffs2_full_dnode *fn);
 int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_full_dnode *fn);
 int jffs2_do_read_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, 
 			uint32_t ino, struct jffs2_raw_inode *latest_node);