From owner-p4-projects@FreeBSD.ORG  Tue Oct 25 21:38:30 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADD02106574C; Tue, 25 Oct 2011 21:38:30 +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 EAE2F106566C
	for <perforce@freebsd.org>; Tue, 25 Oct 2011 21:38:29 +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 D94248FC18
	for <perforce@freebsd.org>; Tue, 25 Oct 2011 21:38:29 +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 p9PLcT9t018967
	for <perforce@freebsd.org>; Tue, 25 Oct 2011 21:38:29 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9PLcTqn018964
	for perforce@freebsd.org; Tue, 25 Oct 2011 21:38:29 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 25 Oct 2011 21:38:29 GMT
Message-Id: <201110252138.p9PLcTqn018964@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 200720 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: Tue, 25 Oct 2011 21:38:31 -0000

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

Change 200720 by jhb@jhb_jhbbsd on 2011/10/25 21:38:07

	Properly handle FADV_NORMAL clearing one end of a range when
	one edge of the FADV_NORMAL region matches the existing range
	exactly.

Affected files ...

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

Differences ...

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

@@ -4934,6 +4934,12 @@
 			if (uap->offset <= fp->f_advstart &&
 			    end >= fp->f_advend)
 				fp->f_advice = FADV_NORMAL;
+			else if (uap->offset <= fp->f_advstart &&
+			    end >= fp->f_advstart)
+				fp->f_advstart = end + 1;
+			else if (uap->offset <= fp->f_advend &&
+			    end >= fp->f_advend)
+				fp->f_advend = uap->offset - 1;
 			else if (uap->offset >= fp->f_advstart &&
 			    end <= fp->f_advend)
 				/*
@@ -4945,12 +4951,6 @@
 				 * preserve.
 				 */
 				fp->f_advice = FADV_NORMAL;
-			else if (uap->offset <= fp->f_advstart &&
-			    end >= fp->f_advstart)
-				fp->f_advstart = end + 1;
-			else if (uap->offset <= fp->f_advend &&
-			    end >= fp->f_advstart)
-				fp->f_advend = uap->offset - 1;
 		}
 		mtx_pool_unlock(mtxpool_sleep, fp);
 		break;