From owner-svn-src-user@FreeBSD.ORG  Wed Jun 26 21:58:29 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3D1BAA53;
 Wed, 26 Jun 2013 21:58:29 +0000 (UTC)
 (envelope-from attilio@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 2EF621F83;
 Wed, 26 Jun 2013 21:58:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5QLwTed078362;
 Wed, 26 Jun 2013 21:58:29 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5QLwToG078361;
 Wed, 26 Jun 2013 21:58:29 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201306262158.r5QLwToG078361@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 26 Jun 2013 21:58:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r252261 - user/attilio/vmobj-readlock/sys/vm
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Jun 2013 21:58:29 -0000

Author: attilio
Date: Wed Jun 26 21:58:28 2013
New Revision: 252261
URL: http://svnweb.freebsd.org/changeset/base/252261

Log:
  Reintroduce a check that seems necessary for the time being.
  
  Sponsored by:	EMC / Isilon storage division
  Reported by:	pho

Modified:
  user/attilio/vmobj-readlock/sys/vm/vm_glue.c

Modified: user/attilio/vmobj-readlock/sys/vm/vm_glue.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_glue.c	Wed Jun 26 20:39:07 2013	(r252260)
+++ user/attilio/vmobj-readlock/sys/vm/vm_glue.c	Wed Jun 26 21:58:28 2013	(r252261)
@@ -551,7 +551,7 @@ vm_thread_swapin(struct thread *td)
 			for (k = i; k < j; k++)
 				ma[k] = vm_page_lookup(ksobj, k);
 			vm_page_busy_wunlock(ma[i]);
-		} else
+		} else if (vm_page_busy_wlocked(ma[i])
 			vm_page_busy_wunlock(ma[i]);
 	}
 	VM_OBJECT_WUNLOCK(ksobj);