From owner-svn-src-stable@FreeBSD.ORG  Fri Oct 21 22:07:52 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA37E106566B;
	Fri, 21 Oct 2011 22:07:52 +0000 (UTC)
	(envelope-from mckusick@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AF3408FC0A;
	Fri, 21 Oct 2011 22:07:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9LM7qop043350;
	Fri, 21 Oct 2011 22:07:52 GMT
	(envelope-from mckusick@svn.freebsd.org)
Received: (from mckusick@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9LM7q1K043348;
	Fri, 21 Oct 2011 22:07:52 GMT
	(envelope-from mckusick@svn.freebsd.org)
Message-Id: <201110212207.p9LM7q1K043348@svn.freebsd.org>
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Fri, 21 Oct 2011 22:07:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226621 - stable/9/sbin/tunefs
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Oct 2011 22:07:53 -0000

Author: mckusick
Date: Fri Oct 21 22:07:52 2011
New Revision: 226621
URL: http://svn.freebsd.org/changeset/base/226621

Log:
  MFC 226266:
  After creating a filesystem using newfs -j the time stamps are all
  zero and thus report as having been made in January 1970. Apart
  from looking a bit silly, it also triggers alarms from scripts
  that detect weird time stamps. This update sets all 4 (or 3, in
  the case of UFS1) time stamps to the current time when enabling
  journaling during newfs or later when enabling it with tunefs.
  
  Reported by: Hans Ottevanger <hans@beastielabs.net>
  Approved by: re (kib)

Modified:
  stable/9/sbin/tunefs/tunefs.c

Modified: stable/9/sbin/tunefs/tunefs.c
==============================================================================
--- stable/9/sbin/tunefs/tunefs.c	Fri Oct 21 21:49:34 2011	(r226620)
+++ stable/9/sbin/tunefs/tunefs.c	Fri Oct 21 22:07:52 2011	(r226621)
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 /* the optimization warning string template */
@@ -923,6 +924,7 @@ journal_alloc(int64_t size)
 	ino_t ino;
 	int blks;
 	int mode;
+	time_t utime;
 	int i;
 
 	cgp = &disk.d_cg;
@@ -983,18 +985,26 @@ journal_alloc(int64_t size)
 		 */
 		dp2 = ip;
 		dp1 = ip;
+		time(&utime);
 		if (sblock.fs_magic == FS_UFS1_MAGIC) {
 			bzero(dp1, sizeof(*dp1));
 			dp1->di_size = size;
 			dp1->di_mode = IFREG | IREAD;
 			dp1->di_nlink = 1;
 			dp1->di_flags = SF_IMMUTABLE | SF_NOUNLINK | UF_NODUMP;
+			dp1->di_atime = utime;
+			dp1->di_mtime = utime;
+			dp1->di_ctime = utime;
 		} else {
 			bzero(dp2, sizeof(*dp2));
 			dp2->di_size = size;
 			dp2->di_mode = IFREG | IREAD;
 			dp2->di_nlink = 1;
 			dp2->di_flags = SF_IMMUTABLE | SF_NOUNLINK | UF_NODUMP;
+			dp2->di_atime = utime;
+			dp2->di_mtime = utime;
+			dp2->di_ctime = utime;
+			dp2->di_birthtime = utime;
 		}
 		for (i = 0; i < NDADDR && resid; i++, resid--) {
 			blk = journal_balloc();