From owner-p4-projects@FreeBSD.ORG  Fri Sep 30 21:55:49 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7D70216A421; Fri, 30 Sep 2005 21:55:48 +0000 (GMT)
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 4E84816A41F
	for <perforce@freebsd.org>; Fri, 30 Sep 2005 21:55:48 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1CD9443D4C
	for <perforce@freebsd.org>; Fri, 30 Sep 2005 21:55:48 +0000 (GMT)
	(envelope-from scottl@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 j8ULtm9M089559
	for <perforce@freebsd.org>; Fri, 30 Sep 2005 21:55:48 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8ULtlKQ089556
	for perforce@freebsd.org; Fri, 30 Sep 2005 21:55:47 GMT
	(envelope-from scottl@freebsd.org)
Date: Fri, 30 Sep 2005 21:55:47 GMT
Message-Id: <200509302155.j8ULtlKQ089556@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 84582 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Sep 2005 21:55:49 -0000

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

Change 84582 by scottl@scottl-junior on 2005/09/30 21:55:43

	Correct some faulty logic.

Affected files ...

.. //depot/projects/soc2005/ufsj/src/sbin/tunefs/tunefs.c#6 edit

Differences ...

==== //depot/projects/soc2005/ufsj/src/sbin/tunefs/tunefs.c#6 (text+ko) ====

@@ -75,6 +75,11 @@
 void usage(void);
 void printfs(void);
 
+/*
+ * Create a valid journal file.
+ * XXX This is just a hack at the moment.  The real version will generate the
+ * appropriate metadata instead of relying on the FS to do it.
+ */
 ino_t
 create_journal(void)
 {
@@ -88,15 +93,12 @@
 	args.fspec = (void *)disk.d_name;
 	if (mount("ufs", "/mnt", 0, &args) < 0)
 		err(1, "%s", disk.d_name);
-	if (stat("/mnt/.jounal", &sb) == 0) {
-		unlink("/mnt/.journal");
-	}
 
 	if (statfs("/mnt", &fs) < 0)
 		err(1, "%s", disk.d_name);
 	jblocks = fs.f_blocks * .01;
 
-	fd = open("/mnt/.journal", O_RDWR | O_CREAT);
+	fd = open("/mnt/.journal", O_RDWR | O_CREAT | O_TRUNC);
 	if (fd < 0)
 		err(1, "%s", disk.d_name);