jffs2: fix up rb_root initializations to use RB_ROOT
authorVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Mon, 15 Mar 2010 04:34:59 +0000 (00:34 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Mar 2010 01:43:47 +0000 (18:43 -0700)
jffs2 uses rb_node = NULL; to zero rb_root.

The problem with this is that 17d9ddc72fb8bba0d4f678 ("rbtree: Add
support for augmented rbtrees") in the linux-next tree adds a new field
to that struct which needs to be NULL as well.  This patch uses RB_ROOT
as the intializer so all of the relevant fields will be NULL'd.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Eric Paris <eparis@redhat.com>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/jffs2/readinode.c

index e22de8397b7430f3e48bcd2ae32ca0af70fe0a12..d32ee9412cb991a82ba04b0d1eb1abcec98d570d 100644 (file)
@@ -567,7 +567,7 @@ static void jffs2_free_tmp_dnode_info_list(struct rb_root *list)
                        else BUG();
                }
        }
-       list->rb_node = NULL;
+       *list = RB_ROOT;
 }
 
 static void jffs2_free_full_dirent_list(struct jffs2_full_dirent *fd)