Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / fs / ext3 / dir.c

diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index bafdd48eefde60a926e8f5478cf97a0ee2e1f598..e66e4808719f1958cec123853cd7224ee103d479 100644 (file)
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -309,43 +309,17 @@ struct fname {
  */
 static void free_rb_tree_fname(struct rb_root *root)
 {
-       struct rb_node  *n = root->rb_node;
-       struct rb_node  *parent;
-       struct fname    *fname;
-
-       while (n) {
-               /* Do the node's children first */
-               if (n->rb_left) {
-                       n = n->rb_left;
-                       continue;
-               }
-               if (n->rb_right) {
-                       n = n->rb_right;
-                       continue;
-               }
-               /*
-                * The node has no children; free it, and then zero
-                * out parent's link to it.  Finally go to the
-                * beginning of the loop and try to free the parent
-                * node.
-                */
-               parent = rb_parent(n);
-               fname = rb_entry(n, struct fname, rb_hash);
-               while (fname) {
-                       struct fname * old = fname;
+       struct fname *fname, *next;
+
+       rbtree_postorder_for_each_entry_safe(fname, next, root, rb_hash)
+               do {
+                       struct fname *old = fname;
                        fname = fname->next;
-                       kfree (old);
-               }
-               if (!parent)
-                       *root = RB_ROOT;
-               else if (parent->rb_left == n)
-                       parent->rb_left = NULL;
-               else if (parent->rb_right == n)
-                       parent->rb_right = NULL;
-               n = parent;
-       }
-}
+                       kfree(old);
+               } while (fname);
 
+       *root = RB_ROOT;
+}
 
 static struct dir_private_info *ext3_htree_create_dir_info(struct file *filp,
                                                           loff_t pos)