---

yaml --- r: 30936 b: refs/heads/master c: 8a13695 h: refs/heads/master v: v3
git-mirror · Jun 27, 2006 · 59ecc20 · 59ecc20
1 parent f746319
commit 59ecc20
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 228 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1ae76e96a18edf4b8a4d4e102762060c26d1c6a
+refs/heads/master: 8a13695cbe4e8311b363f9bd25162904b984ca74
diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c
@@ -332,10 +332,8 @@ static int jffs2_scan_xattr_node(struct jffs2_sb_info *c, struct jffs2_erasebloc
 	xid = je32_to_cpu(rx->xid);
 	version = je32_to_cpu(rx->version);
 
-	totlen = sizeof(struct jffs2_raw_xattr);
-	if (version != XDATUM_DELETE_MARKER)
-		totlen += rx->name_len + 1 + je16_to_cpu(rx->value_len);
-	totlen = PAD(totlen);
+	totlen = PAD(sizeof(struct jffs2_raw_xattr)
+			+ rx->name_len + 1 + je16_to_cpu(rx->value_len));
 	if (totlen != je32_to_cpu(rx->totlen)) {
 		JFFS2_WARNING("node length mismatch at %#08x, read=%u, calc=%u\n",
 			      ofs, je32_to_cpu(rx->totlen), totlen);