From owner-svn-src-stable-9@FreeBSD.ORG  Wed Mar  6 20:02:59 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E461681E;
 Wed,  6 Mar 2013 20:02:59 +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 D5B45303;
 Wed,  6 Mar 2013 20:02:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r26K2bnk050875;
 Wed, 6 Mar 2013 20:02:47 GMT (envelope-from pho@svn.freebsd.org)
Received: (from pho@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r26K2PrL050857;
 Wed, 6 Mar 2013 20:02:25 GMT (envelope-from pho@svn.freebsd.org)
Message-Id: <201303062002.r26K2PrL050857@svn.freebsd.org>
From: Peter Holm <pho@FreeBSD.org>
Date: Wed, 6 Mar 2013 20:02:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r247900 - stable/9/sbin/tunefs
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Mar 2013 20:03:00 -0000

Author: pho
Date: Wed Mar  6 20:02:19 2013
New Revision: 247900
URL: http://svnweb.freebsd.org/changeset/base/247900

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

Modified:
  stable/9/sbin/tunefs/tunefs.c
Directory Properties:
  stable/9/sbin/tunefs/   (props changed)

Modified: stable/9/sbin/tunefs/tunefs.c
==============================================================================
--- stable/9/sbin/tunefs/tunefs.c	Wed Mar  6 19:59:42 2013	(r247899)
+++ stable/9/sbin/tunefs/tunefs.c	Wed Mar  6 20:02:19 2013	(r247900)
@@ -672,7 +672,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);
 		}