trace/trace_stat: use rbtree postorder iteration helper instead of opencoding

Use rbtree_postorder_for_each_entry_safe() to destroy the rbtree instead of opencoding an alternate postorder iteration that modifies the tree Link: http://lkml.kernel.org/r/1383345566-25087-2-git-send-email-cody@linux.vnet.ibm.com Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

trace/trace_stat: use rbtree postorder iteration helper instead of opencoding
Use rbtree_postorder_for_each_entry_safe() to destroy the rbtree instead of opencoding an alternate postorder iteration that modifies the tree Link: http://lkml.kernel.org/r/1383345566-25087-2-git-send-email-cody@linux.vnet.ibm.com Signed-off-by: Cody P Schafer <cody@linux.vnet.ibm.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cody P Schafer · Steven Rostedt
1 parent 29ad23b004
Showing 1 changed file with 5 additions and 36 deletions Side-by-side Diff
kernel/trace/trace_stat.c
@@ -43,46 +43,15 @@
 /* The root directory for all stat files */
 static struct dentry		*stat_dir;
  
-/*
- * Iterate through the rbtree using a post order traversal path
- * to release the next node.
- * It won't necessary release one at each iteration
- * but it will at least advance closer to the next one
- * to be released.
- */
-static struct rb_node *release_next(struct tracer_stat *ts,
-				    struct rb_node *node)
+static void __reset_stat_session(struct stat_session *session)
 {
-	struct stat_node *snode;
-	struct rb_node *parent = rb_parent(node);
+	struct stat_node *snode, *n;
  
-	if (node->rb_left)
-		return node->rb_left;
-	else if (node->rb_right)
-		return node->rb_right;
-	else {
-		if (!parent)
-			;
-		else if (parent->rb_left == node)
-			parent->rb_left = NULL;
-		else
-			parent->rb_right = NULL;
-
-		snode = container_of(node, struct stat_node, node);
-		if (ts->stat_release)
-			ts->stat_release(snode->stat);
+	rbtree_postorder_for_each_entry_safe(snode, n, &session->stat_root, node) {
+		if (session->ts->stat_release)
+			session->ts->stat_release(snode->stat);
 		kfree(snode);
-
-		return parent;
 	}
-}
-
-static void __reset_stat_session(struct stat_session *session)
-{
-	struct rb_node *node = session->stat_root.rb_node;
-
-	while (node)
-		node = release_next(session->ts, node);
  
 	session->stat_root = RB_ROOT;
 }
...	...	@@ -43,46 +43,15 @@
43	43	/* The root directory for all stat files */
44	44	static struct dentry *stat_dir;
45	45
46		-/*
47		- * Iterate through the rbtree using a post order traversal path
48		- * to release the next node.
49		- * It won't necessary release one at each iteration
50		- * but it will at least advance closer to the next one
51		- * to be released.
52		- */
53		-static struct rb_node release_next(struct tracer_stat ts,
54		- struct rb_node *node)
	46	+static void __reset_stat_session(struct stat_session *session)
55	47	{
56		- struct stat_node *snode;
57		- struct rb_node *parent = rb_parent(node);
	48	+ struct stat_node snode, n;
58	49
59		- if (node->rb_left)
60		- return node->rb_left;
61		- else if (node->rb_right)
62		- return node->rb_right;
63		- else {
64		- if (!parent)
65		- ;
66		- else if (parent->rb_left == node)
67		- parent->rb_left = NULL;
68		- else
69		- parent->rb_right = NULL;
70		-
71		- snode = container_of(node, struct stat_node, node);
72		- if (ts->stat_release)
73		- ts->stat_release(snode->stat);
	50	+ rbtree_postorder_for_each_entry_safe(snode, n, &session->stat_root, node) {
	51	+ if (session->ts->stat_release)
	52	+ session->ts->stat_release(snode->stat);
74	53	kfree(snode);
75		-
76		- return parent;
77	54	}
78		-}
79		-
80		-static void __reset_stat_session(struct stat_session *session)
81		-{
82		- struct rb_node *node = session->stat_root.rb_node;
83		-
84		- while (node)
85		- node = release_next(session->ts, node);
86	55
87	56	session->stat_root = RB_ROOT;
88	57	}