From owner-svn-src-head@FreeBSD.ORG  Sat Jun 11 20:13:28 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E1B601065673;
	Sat, 11 Jun 2011 20:13:28 +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 D216E8FC16;
	Sat, 11 Jun 2011 20:13:28 +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 p5BKDSOc089593;
	Sat, 11 Jun 2011 20:13:28 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5BKDSAY089591;
	Sat, 11 Jun 2011 20:13:28 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <201106112013.p5BKDSAY089591@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Sat, 11 Jun 2011 20:13:28 +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: r222991 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Jun 2011 20:13:29 -0000

Author: kib
Date: Sat Jun 11 20:13:28 2011
New Revision: 222991
URL: http://svn.freebsd.org/changeset/base/222991

Log:
  Fix a bug in r222586. Lock the page owner object around the modification
  of the m->dirty.
  
  Reported and tested by:	nwhitehorn
  Reviewed by:	alc

Modified:
  head/sys/vm/vnode_pager.c

Modified: head/sys/vm/vnode_pager.c
==============================================================================
--- head/sys/vm/vnode_pager.c	Sat Jun 11 18:39:55 2011	(r222990)
+++ head/sys/vm/vnode_pager.c	Sat Jun 11 20:13:28 2011	(r222991)
@@ -1195,8 +1195,13 @@ vnode_pager_generic_putpages(struct vnod
 void
 vnode_pager_undirty_pages(vm_page_t *ma, int *rtvals, int written)
 {
+	vm_object_t obj;
 	int i, pos;
 
+	if (written == 0)
+		return;
+	obj = ma[0]->object;
+	VM_OBJECT_LOCK(obj);
 	for (i = 0, pos = 0; pos < written; i++, pos += PAGE_SIZE) {
 		if (pos < trunc_page(written)) {
 			rtvals[i] = VM_PAGER_OK;
@@ -1207,4 +1212,5 @@ vnode_pager_undirty_pages(vm_page_t *ma,
 			vm_page_clear_dirty(ma[i], 0, written & PAGE_MASK);
 		}
 	}
+	VM_OBJECT_UNLOCK(obj);
 }