From owner-trustedbsd-cvs@FreeBSD.ORG Wed Mar 15 20:05:59 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2DDF16A423 for ; Wed, 15 Mar 2006 20:05:59 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA04D43D48 for ; Wed, 15 Mar 2006 20:05:58 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 5B99846C04 for ; Wed, 15 Mar 2006 15:05:32 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 52734CFCF0; Wed, 15 Mar 2006 20:01:42 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C02E16A425; Wed, 15 Mar 2006 20:01:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E9DB316A423 for ; Wed, 15 Mar 2006 20:01:41 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5B2243D45 for ; Wed, 15 Mar 2006 20:01:41 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2FK1foN085565 for ; Wed, 15 Mar 2006 20:01:41 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2FK1fk7085562 for perforce@freebsd.org; Wed, 15 Mar 2006 20:01:41 GMT (envelope-from millert@freebsd.org) Date: Wed, 15 Mar 2006 20:01:41 GMT Message-Id: <200603152001.k2FK1fk7085562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 93366 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2006 20:05:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=93366 Change 93366 by millert@millert_p3 on 2006/03/15 20:01:38 Get rid of non-std -e option; we want to check extattrs for ufs2 by default. Affected files ... .. //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/fsck.h#9 edit .. //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/main.c#10 edit .. //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/pass1.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/fsck.h#9 (text+ko) ==== @@ -280,7 +280,6 @@ char resolved; /* cleared if unresolved changes => not clean */ char havesb; /* superblock has been read */ char skipclean; /* skip clean file systems if preening */ -char extattr; /* take a lot longer, and check ea's */ int fsmodified; /* 1 => write done to file system */ int fsreadfd; /* file descriptor for reading file system */ int fswritefd; /* file descriptor for writing file system */ ==== //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/main.c#10 (text+ko) ==== @@ -79,7 +79,7 @@ sync(); skipclean = 1; - while ((ch = getopt(argc, argv, "b:Bc:defFm:npy")) != -1) { + while ((ch = getopt(argc, argv, "b:Bc:dfFm:npy")) != -1) { switch (ch) { case 'b': skipclean = 0; @@ -103,10 +103,6 @@ debug++; break; - case 'e': - extattr++; - break; - case 'f': skipclean = 0; break; ==== //depot/projects/trustedbsd/sebsd/sbin/fsck_ffs/pass1.c#8 (text+ko) ==== @@ -340,7 +340,7 @@ break; } } - if (extattr && sblock.fs_magic == FS_UFS2_MAGIC) + if (sblock.fs_magic == FS_UFS2_MAGIC) eascan(idesc, &dp->dp2); idesc->id_entryno *= btodb(sblock.fs_fsize); if (DIP(dp, di_blocks) != idesc->id_entryno) {