From owner-svn-src-all@FreeBSD.ORG  Sat Jan 19 06:17:27 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BF883BF5;
 Sat, 19 Jan 2013 06:17:27 +0000 (UTC) (envelope-from kib@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 B23FECD3;
 Sat, 19 Jan 2013 06:17:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0J6HRL3012909;
 Sat, 19 Jan 2013 06:17:27 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0J6HRGM012908;
 Sat, 19 Jan 2013 06:17:27 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201301190617.r0J6HRGM012908@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 19 Jan 2013 06:17:27 +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: r245659 - stable/9/sbin/geom/class/journal
X-SVN-Group: stable-9
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: Sat, 19 Jan 2013 06:17:27 -0000

Author: kib
Date: Sat Jan 19 06:17:27 2013
New Revision: 245659
URL: http://svnweb.freebsd.org/changeset/base/245659

Log:
  MFC r245072:
  Do not round up the size of the UFS filesystem to the fragment size
  when comparing its size with the size of the media, to determine if
  the last disk block is unused.
  
  MFC r245074:
  Use tabs for indentation.

Modified:
  stable/9/sbin/geom/class/journal/geom_journal_ufs.c
Directory Properties:
  stable/9/sbin/geom/   (props changed)

Modified: stable/9/sbin/geom/class/journal/geom_journal_ufs.c
==============================================================================
--- stable/9/sbin/geom/class/journal/geom_journal_ufs.c	Sat Jan 19 06:04:26 2013	(r245658)
+++ stable/9/sbin/geom/class/journal/geom_journal_ufs.c	Sat Jan 19 06:17:27 2013	(r245659)
@@ -73,6 +73,6 @@ g_journal_ufs_using_last_sector(const ch
 	/* Provider size in 512 bytes blocks. */
 	psize = g_get_mediasize(prov) / DEV_BSIZE;
 	/* File system size in 512 bytes blocks. */
-	fssize = fsbtodb(fs, dbtofsb(fs, psize));
-	return (psize == fssize);
+	fssize = fsbtodb(fs, fs->fs_size);
+	return (psize <= fssize);
 }