Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc54e2a authored by Venkatesh Pallipadi's avatar Venkatesh Pallipadi Committed by Linus Torvalds
Browse files

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: default avatarVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Eric Paris <eparis@redhat.com>
Acked-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e9e58a4e

fs/jffs2/readinode.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -567,7 +567,7 @@ static void jffs2_free_tmp_dnode_info_list(struct rb_root *list) 
			else BUG();

			else BUG();

		}

		}

	}

	}

	list->rb_node = NULL;

	*list = RB_ROOT;

}

}





static void jffs2_free_full_dirent_list(struct jffs2_full_dirent *fd)

static void jffs2_free_full_dirent_list(struct jffs2_full_dirent *fd)