[1/2] jffs2: fix up rb_root initializations to use RB_ROOT

Message ID 201003112205.o2BM5bFt013302@imap1.linux-foundation.org
State New, archived
Headers show

Commit Message

Andrew Morton March 11, 2010, 10:05 p.m.
From: venkatesh.pallipadi@intel.com

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 NULLas 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>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

 fs/jffs2/readinode.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff -puN fs/jffs2/readinode.c~jffs2-fixup-rb_root-initializations-to-use-rb_root fs/jffs2/readinode.c
--- a/fs/jffs2/readinode.c~jffs2-fixup-rb_root-initializations-to-use-rb_root
+++ a/fs/jffs2/readinode.c
@@ -567,7 +567,7 @@  static void jffs2_free_tmp_dnode_info_li
 			else BUG();
-	list->rb_node = NULL;
+	*list = RB_ROOT;
 static void jffs2_free_full_dirent_list(struct jffs2_full_dirent *fd)