Skip to contentSkip to conversation

jffs2: fix up rb_root initializations to use RB_ROOT

PATCH Applied [email protected] 1 participant 1 message Mar 11, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

From: [email protected]

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.

---

 fs/jffs2/readinode.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/jffs2/readinode.c renamed from fs/jffs2/readinode.c~jffs2-fixup-rb_root-initializations-to-use-rb_root +1 -1
diff -puN fs/jffs2/readinode.c~jffs2-fixup-rb_root-initializations-to-use-rb_root 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)

_