From owner-svn-src-stable@FreeBSD.ORG  Wed Aug 22 05:30:52 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 218EB106564A;
	Wed, 22 Aug 2012 05:30:52 +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 0BCB28FC0C;
	Wed, 22 Aug 2012 05:30: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 q7M5UpIs073232;
	Wed, 22 Aug 2012 05:30:51 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7M5Upk7073229;
	Wed, 22 Aug 2012 05:30:51 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201208220530.q7M5Upk7073229@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 22 Aug 2012 05:30:51 +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: r239559 - stable/9/sbin/fsck_ffs
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: Wed, 22 Aug 2012 05:30:52 -0000

Author: kib
Date: Wed Aug 22 05:30:51 2012
New Revision: 239559
URL: http://svn.freebsd.org/changeset/base/239559

Log:
  MFC r238984:
  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.

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

Modified: stable/9/sbin/fsck_ffs/suj.c
==============================================================================
--- stable/9/sbin/fsck_ffs/suj.c	Wed Aug 22 05:28:55 2012	(r239558)
+++ stable/9/sbin/fsck_ffs/suj.c	Wed Aug 22 05:30:51 2012	(r239559)
@@ -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);