From owner-svn-src-all@FreeBSD.ORG  Fri Feb 24 10:41:58 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9F44106566B;
	Fri, 24 Feb 2012 10:41:58 +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 D5E018FC08;
	Fri, 24 Feb 2012 10:41:58 +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 q1OAfwes055384;
	Fri, 24 Feb 2012 10:41:58 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1OAfwWv055382;
	Fri, 24 Feb 2012 10:41:58 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201202241041.q1OAfwWv055382@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Fri, 24 Feb 2012 10:41:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232103 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 24 Feb 2012 10:41:59 -0000

Author: kib
Date: Fri Feb 24 10:41:58 2012
New Revision: 232103
URL: http://svn.freebsd.org/changeset/base/232103

Log:
  Place the if() at the right location, to activate the v_writecount
  accounting for shared writeable mappings for all filesystems, not only
  for the bypass layers.
  
  Submitted by:	alc
  Pointy hat to:	kib
  MFC after:	20 days

Modified:
  head/sys/vm/vm_mmap.c

Modified: head/sys/vm/vm_mmap.c
==============================================================================
--- head/sys/vm/vm_mmap.c	Fri Feb 24 07:54:08 2012	(r232102)
+++ head/sys/vm/vm_mmap.c	Fri Feb 24 10:41:58 2012	(r232103)
@@ -1272,10 +1272,10 @@ vm_mmap_vnode(struct thread *td, vm_size
 				VFS_UNLOCK_GIANT(vfslocked);
 				return (error);
 			}
-			if (locktype == LK_EXCLUSIVE) {
-				*writecounted = TRUE;
-				vnode_pager_update_writecount(obj, 0, objsize);
-			}
+		}
+		if (locktype == LK_EXCLUSIVE) {
+			*writecounted = TRUE;
+			vnode_pager_update_writecount(obj, 0, objsize);
 		}
 	} else if (vp->v_type == VCHR) {
 		error = vm_mmap_cdev(td, objsize, prot, maxprotp, flagsp,