diff --git a/[refs] b/[refs]
index 2aaaf5bb33b3..3c092426653c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcb7578719529898aef9edce8e409e457a1c2d15
+refs/heads/master: 0eac940b8a087576c66ecf8e0f294f2ceb3b607b
diff --git a/trunk/fs/jffs2/erase.c b/trunk/fs/jffs2/erase.c
index 0fc19a2fb5d9..4616fed75730 100644
--- a/trunk/fs/jffs2/erase.c
+++ b/trunk/fs/jffs2/erase.c
@@ -230,6 +230,7 @@ static inline void jffs2_remove_node_refs_from_ino_list(struct jffs2_sb_info *c,
 			   at the end of the linked list. Stash it and continue
 			   from the beginning of the list */
 			ic = (struct jffs2_inode_cache *)(*prev);
+			BUG_ON(ic->class != RAWNODE_CLASS_INODE_CACHE);
 			prev = &ic->nodes;
 			continue;
 		}
diff --git a/trunk/fs/jffs2/nodemgmt.c b/trunk/fs/jffs2/nodemgmt.c
index e10e58eab8e5..34a452bdde05 100644
--- a/trunk/fs/jffs2/nodemgmt.c
+++ b/trunk/fs/jffs2/nodemgmt.c
@@ -661,6 +661,10 @@ void jffs2_mark_node_obsolete(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
 		spin_lock(&c->erase_completion_lock);
 
 		ic = jffs2_raw_ref_to_ic(ref);
+		/* It seems we should never call jffs2_mark_node_obsolete() for
+		   XATTR nodes.... yet. Make sure we notice if/when we change
+		   that :) */
+		BUG_ON(ic->class != RAWNODE_CLASS_INODE_CACHE);
 		for (p = &ic->nodes; (*p) != ref; p = &((*p)->next_in_ino))
 			;