diff --git a/[refs] b/[refs]
index fc4918e7c6c7..ade289597fea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae5d31263c746f1680d005b33a82d167cdb9eb6
+refs/heads/master: 2ad8ee713566671875216ebcec64f2eda47bd19d
diff --git a/trunk/fs/jffs2/xattr.c b/trunk/fs/jffs2/xattr.c
index 073469856d4e..e48665984cb3 100644
--- a/trunk/fs/jffs2/xattr.c
+++ b/trunk/fs/jffs2/xattr.c
@@ -754,6 +754,10 @@ void jffs2_clear_xattr_subsystem(struct jffs2_sb_info *c)
 		list_del(&xd->xindex);
 		jffs2_free_xattr_datum(xd);
 	}
+	list_for_each_entry_safe(xd, _xd, &c->xattr_unchecked, xindex) {
+		list_del(&xd->xindex);
+		jffs2_free_xattr_datum(xd);
+	}
 }
 
 #define XREF_TMPHASH_SIZE	(128)