From owner-svn-src-all@FreeBSD.ORG  Wed Jan 23 14:29:30 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 F3484ACE;
 Wed, 23 Jan 2013 14:29:29 +0000 (UTC) (envelope-from pfg@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 DBB9B6D3;
 Wed, 23 Jan 2013 14:29:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0NETThv028088;
 Wed, 23 Jan 2013 14:29:29 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0NETTOC028087;
 Wed, 23 Jan 2013 14:29:29 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201301231429.r0NETTOC028087@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 23 Jan 2013 14:29:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245844 - head/sys/fs/ext2fs
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, 23 Jan 2013 14:29:30 -0000

Author: pfg
Date: Wed Jan 23 14:29:29 2013
New Revision: 245844
URL: http://svnweb.freebsd.org/changeset/base/245844

Log:
  ext2fs: fix a check for negative block numbers.
  
  The previous change accidentally left the substraction we
  were trying to avoid in case that i_blocks could become
  negative.
  
  Reported by:	bde
  MFC after:	4 days

Modified:
  head/sys/fs/ext2fs/ext2_inode.c

Modified: head/sys/fs/ext2fs/ext2_inode.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_inode.c	Wed Jan 23 14:14:13 2013	(r245843)
+++ head/sys/fs/ext2fs/ext2_inode.c	Wed Jan 23 14:29:29 2013	(r245844)
@@ -341,10 +341,9 @@ done:
 	 * Put back the real size.
 	 */
 	oip->i_size = length;
-	oip->i_blocks -= blocksreleased;
 	if (oip->i_blocks > blocksreleased)
 		oip->i_blocks -= blocksreleased;
-	else	/* sanity */
+	else			/* sanity */
 		oip->i_blocks = 0;
 	oip->i_flag |= IN_CHANGE;
 	vnode_pager_setsize(ovp, length);