From owner-svn-src-stable@FreeBSD.ORG Thu Apr 4 05:29:38 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3C72A304; Thu, 4 Apr 2013 05:29:38 +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 2ED84708; Thu, 4 Apr 2013 05:29:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r345Tch6024859; Thu, 4 Apr 2013 05:29:38 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r345Tcfo024858; Thu, 4 Apr 2013 05:29:38 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201304040529.r345Tcfo024858@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 4 Apr 2013 05:29:38 +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: r249079 - stable/9/sys/vm X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2013 05:29:38 -0000 Author: kib Date: Thu Apr 4 05:29:37 2013 New Revision: 249079 URL: http://svnweb.freebsd.org/changeset/base/249079 Log: MFC r248815: Release the v_writecount reference on the vnode in case of error, before the vnode is vput() in vm_mmap_vnode(). Modified: stable/9/sys/vm/vm_mmap.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/vm/vm_mmap.c ============================================================================== --- stable/9/sys/vm/vm_mmap.c Thu Apr 4 05:26:22 2013 (r249078) +++ stable/9/sys/vm/vm_mmap.c Thu Apr 4 05:29:37 2013 (r249079) @@ -1352,6 +1352,10 @@ mark_atime: vfs_mark_atime(vp, cred); done: + if (error != 0 && *writecounted) { + *writecounted = FALSE; + vnode_pager_update_writecount(obj, objsize, 0); + } vput(vp); VFS_UNLOCK_GIANT(vfslocked); return (error);