From owner-cvs-all@FreeBSD.ORG Fri Feb 23 20:23:36 2007 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5795F16A400; Fri, 23 Feb 2007 20:23:36 +0000 (UTC) (envelope-from brian@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 48EF613C478; Fri, 23 Feb 2007 20:23:36 +0000 (UTC) (envelope-from brian@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1NKNal4086160; Fri, 23 Feb 2007 20:23:36 GMT (envelope-from brian@repoman.freebsd.org) Received: (from brian@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1NKNaeZ086158; Fri, 23 Feb 2007 20:23:36 GMT (envelope-from brian) Message-Id: <200702232023.l1NKNaeZ086158@repoman.freebsd.org> From: Brian Somers Date: Fri, 23 Feb 2007 20:23:36 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/ufs/ffs ffs_alloc.c ffs_softdep.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Feb 2007 20:23:36 -0000 brian 2007-02-23 20:23:36 UTC FreeBSD src repository Modified files: sys/ufs/ffs ffs_alloc.c ffs_softdep.c Log: Account for di_blocks allocations when IN_SPACECOUNTED is set in an inode's i_flag. It's possible that after ufs_infactive() calls softdep_releasefile(), i_nlink stays >0 for a considerable amount of time (> 60 seconds here). During this period, any ffs allocation routines that alter di_blocks must also account for the blocks in the filesystem's fs_pendingblocks value. This change fixes an eventual df/du discrepency that will happen as the result of fs_pendingblocks being reduced to <0. The only manifestation of this that people may recognise is the following message on boot: /somefs: update error: blocks -N files M at which point the negative pending block count is adjusted to zero. Reviewed by: tegge MFC after: 3 weeks Revision Changes Path 1.145 +28 -3 src/sys/ufs/ffs/ffs_alloc.c 1.204 +4 -4 src/sys/ufs/ffs/ffs_softdep.c