diff --git a/[refs] b/[refs]
index aef345bb5dca..fc4918e7c6c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acaebfd8a7af0019b2edfcf4045c56c3e18375c5
+refs/heads/master: 8ae5d31263c746f1680d005b33a82d167cdb9eb6
diff --git a/trunk/fs/jffs2/xattr.c b/trunk/fs/jffs2/xattr.c
index 78fc08893a6c..073469856d4e 100644
--- a/trunk/fs/jffs2/xattr.c
+++ b/trunk/fs/jffs2/xattr.c
@@ -825,7 +825,7 @@ void jffs2_build_xattr_subsystem(struct jffs2_sb_info *c)
 			   ref->xd and ref->ic are not valid yet. */
 			xd = jffs2_find_xattr_datum(c, ref->xid);
 			ic = jffs2_get_ino_cache(c, ref->ino);
-			if (!xd || !ic) {
+			if (!xd || !ic || !ic->nlink) {
 				dbg_xattr("xref(ino=%u, xid=%u, xseqno=%u) is orphan.\n",
 					  ref->ino, ref->xid, ref->xseqno);
 				ref->xseqno |= XREF_DELETE_MARKER;