From owner-p4-projects@FreeBSD.ORG  Mon Oct 24 19:29:01 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 064961065678; Mon, 24 Oct 2011 19:29:01 +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 BCF021065673
	for <perforce@freebsd.org>; Mon, 24 Oct 2011 19:29:00 +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 AB35F8FC08
	for <perforce@freebsd.org>; Mon, 24 Oct 2011 19:29:00 +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 p9OJT0kF098001
	for <perforce@freebsd.org>; Mon, 24 Oct 2011 19:29:00 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9OJT0FL097998
	for perforce@freebsd.org; Mon, 24 Oct 2011 19:29:00 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 24 Oct 2011 19:29:00 GMT
Message-Id: <201110241929.p9OJT0FL097998@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 200664 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: Mon, 24 Oct 2011 19:29:01 -0000

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

Change 200664 by jhb@jhb_jhbbsd on 2011/10/24 19:28:32

	Merge existing non-standard regions when possible.

Affected files ...

.. //depot/projects/fadvise/sys/kern/vfs_syscalls.c#9 edit

Differences ...

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

@@ -4904,9 +4904,23 @@
 	case FADV_RANDOM:
 	case FADV_NOREUSE:
 		mtx_pool_lock(mtxpool_sleep, fp);
-		fp->f_advice = uap->advice;
-		fp->f_advstart = uap->offset;
-		fp->f_advend = end;
+		/*
+		 * See if we can merge with the existing non-standard
+		 * region.
+		 */
+		if (fp->f_advice == uap->advice &&
+		    ((fp->f_advstart <= end && fp->f_advend >= uap->offset) ||
+		    (fp->f_advstart != 0 && fp->f_advstart == end + 1) ||
+		    (uap->offset != 0 && fp->f_advend + 1 == uap->offset))) {
+			if (uap->offset < fp->f_advstart)
+				fp->f_advstart = uap->offset;
+			if (end > fp->f_advend)
+				fp->f_advend = end;
+		} else {
+			fp->f_advice = uap->advice;
+			fp->f_advstart = uap->offset;
+			fp->f_advend = end;
+		}
 		mtx_pool_unlock(mtxpool_sleep, fp);
 		break;
 	case FADV_NORMAL: