Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2edc322d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents be967b7e 2f3243ae

arch/um/kernel/physmem.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void insert_phys_mapping(struct phys_desc *desc) 
		panic("Physical remapping for %p already present",

		      desc->virt);



	rb_link_node(&desc->rb, (*n)->rb_parent, n);

	rb_link_node(&desc->rb, rb_parent(*n), n);

	rb_insert_color(&desc->rb, &phys_mappings);

}

block/as-iosched.c

+2 −3
Original line number Diff line number Diff line
@@ -353,10 +353,9 @@ static struct request *as_find_arq_hash(struct as_data *ad, sector_t offset) 
/*

 * rb tree support functions

 */

#define RB_NONE		(2)

#define RB_EMPTY(root)	((root)->rb_node == NULL)

#define ON_RB(node)	((node)->rb_color != RB_NONE)

#define RB_CLEAR(node)	((node)->rb_color = RB_NONE)

#define ON_RB(node)	(rb_parent(node) != node)

#define RB_CLEAR(node)	(rb_set_parent(node, node))

#define rb_entry_arq(node)	rb_entry((node), struct as_rq, rb_node)

#define ARQ_RB_ROOT(ad, arq)	(&(ad)->sort_list[(arq)->is_sync])

#define rq_rb_key(rq)		(rq)->sector

block/cfq-iosched.c

+1 −7
Original line number Diff line number Diff line
@@ -60,14 +60,9 @@ static DEFINE_SPINLOCK(cfq_exit_lock); 
/*

 * rb-tree defines

 */

#define RB_NONE			(2)

#define RB_EMPTY(node)		((node)->rb_node == NULL)

#define RB_CLEAR_COLOR(node)	(node)->rb_color = RB_NONE

#define RB_CLEAR(node)		do {	\

	(node)->rb_parent = NULL;	\

	RB_CLEAR_COLOR((node));		\

	(node)->rb_right = NULL;	\

	(node)->rb_left = NULL;		\

		memset(node, 0, sizeof(*node)); \

} while (0)

#define RB_CLEAR_ROOT(root)	((root)->rb_node = NULL)

#define rb_entry_crq(node)	rb_entry((node), struct cfq_rq, rb_node)
@@ -567,7 +562,6 @@ static inline void cfq_del_crq_rb(struct cfq_rq *crq) 
	cfq_update_next_crq(crq);



	rb_erase(&crq->rb_node, &cfqq->sort_list);

	RB_CLEAR_COLOR(&crq->rb_node);



	if (cfq_cfqq_on_rr(cfqq) && RB_EMPTY(&cfqq->sort_list))

		cfq_del_cfqq_rr(cfqd, cfqq);

block/deadline-iosched.c

+2 −3
Original line number Diff line number Diff line
@@ -165,10 +165,9 @@ deadline_find_drq_hash(struct deadline_data *dd, sector_t offset) 
/*

 * rb tree support functions

 */

#define RB_NONE		(2)

#define RB_EMPTY(root)	((root)->rb_node == NULL)

#define ON_RB(node)	((node)->rb_color != RB_NONE)

#define RB_CLEAR(node)	((node)->rb_color = RB_NONE)

#define ON_RB(node)	(rb_parent(node) != node)

#define RB_CLEAR(node)	(rb_set_parent(node, node))

#define rb_entry_drq(node)	rb_entry((node), struct deadline_rq, rb_node)

#define DRQ_RB_ROOT(dd, drq)	(&(dd)->sort_list[rq_data_dir((drq)->request)])

#define rq_rb_key(rq)		(rq)->sector

fs/eventpoll.c

+3 −3
Original line number Diff line number Diff line
@@ -337,20 +337,20 @@ static inline int ep_cmp_ffd(struct epoll_filefd *p1, 
/* Special initialization for the rb-tree node to detect linkage */

static inline void ep_rb_initnode(struct rb_node *n)

{

	n->rb_parent = n;

	rb_set_parent(n, n);

}



/* Removes a node from the rb-tree and marks it for a fast is-linked check */

static inline void ep_rb_erase(struct rb_node *n, struct rb_root *r)

{

	rb_erase(n, r);

	n->rb_parent = n;

	rb_set_parent(n, n);

}



/* Fast check to verify that the item is linked to the main rb-tree */

static inline int ep_rb_linked(struct rb_node *n)

{

	return n->rb_parent != n;

	return rb_parent(n) != n;

}



/*