From owner-svn-src-all@FreeBSD.ORG  Wed Feb 27 18:12:05 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 86A1CCB3;
 Wed, 27 Feb 2013 18:12:05 +0000 (UTC) (envelope-from pho@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 75365351;
 Wed, 27 Feb 2013 18:12:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1RIC46Q051130;
 Wed, 27 Feb 2013 18:12:04 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1RIC4HZ051129;
 Wed, 27 Feb 2013 18:12:04 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201302271812.r1RIC4HZ051129@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 27 Feb 2013 18:12:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247399 - head/sbin/tunefs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Feb 2013 18:12:05 -0000

Author: pho
Date: Wed Feb 27 18:12:04 2013
New Revision: 247399
URL: http://svnweb.freebsd.org/changeset/base/247399

Log:
  The .journal file needs to reside on the ROOTINO which must not extend
  beyond direct blocks. A typo caused this check to fail.

Modified:
  head/sbin/tunefs/tunefs.c

Modified: head/sbin/tunefs/tunefs.c
==============================================================================
--- head/sbin/tunefs/tunefs.c	Wed Feb 27 14:45:23 2013	(r247398)
+++ head/sbin/tunefs/tunefs.c	Wed Feb 27 18:12:04 2013	(r247399)
@@ -671,7 +671,7 @@ journal_findfile(void)
 				return (ino);
 		}
 	} else {
-		if ((off_t)dp1->di_size >= lblktosize(&sblock, NDADDR)) {
+		if ((off_t)dp2->di_size >= lblktosize(&sblock, NDADDR)) {
 			warnx("ROOTINO extends beyond direct blocks.");
 			return (-1);
 		}