Commit bcc54e2a authored Mar 15, 2010 by Venkatesh Pallipadi Committed by Linus Torvalds Mar 17, 2010

jffs2: fix up rb_root initializations to use RB_ROOT



jffs2 uses rb_node = NULL; to zero rb_root.

The problem with this is that 17d9ddc7 ("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>

parent e9e58a4e

fs/jffs2/readinode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

Admin message