From owner-p4-projects  Mon Nov 11 12: 6:45 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B389D37B404; Mon, 11 Nov 2002 12:06:42 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4B57737B401
	for <perforce@freebsd.org>; Mon, 11 Nov 2002 12:06:42 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EF46643FC7
	for <perforce@freebsd.org>; Mon, 11 Nov 2002 12:06:41 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABK4OmV088500
	for <perforce@freebsd.org>; Mon, 11 Nov 2002 12:04:24 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABK4N1Z088497
	for perforce@freebsd.org; Mon, 11 Nov 2002 12:04:23 -0800 (PST)
Date: Mon, 11 Nov 2002 12:04:23 -0800 (PST)
Message-Id: <200211112004.gABK4N1Z088497@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 20972 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=20972

Change 20972 by green@green_laptop_2 on 2002/11/11 12:04:14

	Fix extattr corruption on the disk instead of just noticing
	it.

Affected files ...

.. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/ea.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/ea.c#3 (text+ko) ====

@@ -63,10 +63,14 @@
 eascan(struct inodesc *idesc, struct ufs2_dinode *dp)
 {
 	struct bufarea *bp;
-	char tmpf[sizeof("/tmp/fsck_ffs-extent.XXXXXX")];
 	u_char *cp;
 	long blksiz;
+#if 0
+	char tmpf[sizeof("/tmp/fsck_ffs-extent.XXXXXX")];
 	int fd;
+#else
+	union dinode *fixdp;
+#endif
 
 	if (dp->di_extsize == 0)
 		return 0;
@@ -79,6 +83,7 @@
 	if (chkextattr(cp, dp->di_extsize)) {
 		pfatal("CORRUPT EXTENDED ATTRIBUTES I=%lu",
 		    (u_long)idesc->id_number);
+#if 0
 		if (reply("DUMP EXTENT") == 1) {
 			strcpy(tmpf, "/tmp/fsck_ffs-extent.XXXXXX");
 			fd = mkstemp(tmpf);
@@ -91,6 +96,14 @@
 				(void)close(fd);
 			}
 		}
+#else
+		if (reply("CLEAR") == 1) {
+			fixdp = ginode(idesc->id_number);
+			fixdp->dp2.di_extsize = 0;
+			bzero(&fixdp->dp2.di_extb, sizeof(fixdp->dp2.di_extb));
+			inodirty();
+		}
+#endif
 	}
 	bp->b_flags &= ~B_INUSE;
 	return (0);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message