From owner-svn-src-head@FreeBSD.ORG  Thu Aug  2 10:39:55 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 30A3F106566C;
	Thu,  2 Aug 2012 10:39:55 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B8F78FC0A;
	Thu,  2 Aug 2012 10:39:55 +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 q72AdsLG067246;
	Thu, 2 Aug 2012 10:39:54 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q72Adss4067244;
	Thu, 2 Aug 2012 10:39:54 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201208021039.q72Adss4067244@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Thu, 2 Aug 2012 10:39:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238984 - head/sbin/fsck_ffs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2012 10:39:55 -0000

Author: kib
Date: Thu Aug  2 10:39:54 2012
New Revision: 238984
URL: http://svn.freebsd.org/changeset/base/238984

Log:
  fsck_ffs shall accept the configured journal size, and not refuse to
  operate on it if journal size is greater then SUJ_MAX. The later
  constant is only to select maximal journal size when user did not
  specified size explicitely.
  
  Submitted by:	Andrey Zonov <andrey@zonov.org>
  Reviewed by:	mckusick
  MFC after:	1 week

Modified:
  head/sbin/fsck_ffs/suj.c

Modified: head/sbin/fsck_ffs/suj.c
==============================================================================
--- head/sbin/fsck_ffs/suj.c	Thu Aug  2 08:46:08 2012	(r238983)
+++ head/sbin/fsck_ffs/suj.c	Thu Aug  2 10:39:54 2012	(r238984)
@@ -2383,7 +2383,7 @@ suj_verifyino(union dinode *ip)
 		return (-1);
 	}
 
-	if (DIP(ip, di_size) < SUJ_MIN || DIP(ip, di_size) > SUJ_MAX) {
+	if (DIP(ip, di_size) < SUJ_MIN) {
 		printf("Invalid size %jd for journal inode %d\n",
 		    DIP(ip, di_size), sujino);
 		return (-1);