From owner-p4-projects@FreeBSD.ORG  Wed Oct 26 15:38:22 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C61901065679; Wed, 26 Oct 2011 15:38:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 88C821065677
	for <perforce@freebsd.org>; Wed, 26 Oct 2011 15:38:22 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 773878FC12
	for <perforce@freebsd.org>; Wed, 26 Oct 2011 15:38:22 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9QFcMhF036365
	for <perforce@freebsd.org>; Wed, 26 Oct 2011 15:38:22 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9QFcM9j036362
	for perforce@freebsd.org; Wed, 26 Oct 2011 15:38:22 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 26 Oct 2011 15:38:22 GMT
Message-Id: <201110261538.p9QFcM9j036362@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 200764 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 15:38:23 -0000

http://p4web.freebsd.org/@@200764?ac=10

Change 200764 by jhb@jhb_jhbbsd on 2011/10/26 15:38:18

	Tweaks.

Affected files ...

.. //depot/projects/fadvise/sys/kern/vfs_subr.c#3 edit
.. //depot/projects/fadvise/sys/kern/vfs_syscalls.c#11 edit

Differences ...

==== //depot/projects/fadvise/sys/kern/vfs_subr.c#3 (text+ko) ====

@@ -1256,7 +1256,7 @@
  *
  */
 static int
-flushbuflist( struct bufv *bufv, int flags, struct bufobj *bo, int slpflag,
+flushbuflist(struct bufv *bufv, int flags, struct bufobj *bo, int slpflag,
     int slptimeo)
 {
 	struct buf *bp, *nbp;

==== //depot/projects/fadvise/sys/kern/vfs_syscalls.c#11 (text+ko) ====

@@ -4903,11 +4903,12 @@
 	case FADV_SEQUENTIAL:
 	case FADV_RANDOM:
 	case FADV_NOREUSE:
-		mtx_pool_lock(mtxpool_sleep, fp);
 		/*
-		 * See if we can merge with the existing non-standard
-		 * region.
+		 * Try to merge any existing non-standard region with
+		 * this new region if possible, otherwise create a new
+		 * non-standard region for this request.
 		 */
+		mtx_pool_lock(mtxpool_sleep, fp);
 		if (fp->f_advice == uap->advice &&
 		    ((fp->f_advstart <= end && fp->f_advend >= uap->offset) ||
 		    (fp->f_advstart != 0 && fp->f_advstart == end + 1) ||