From owner-p4-projects@FreeBSD.ORG  Thu Oct 13 14:41:33 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E3F7D1065670; Thu, 13 Oct 2011 14:41:32 +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 A5DD5106564A
	for <perforce@freebsd.org>; Thu, 13 Oct 2011 14:41:32 +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 941BF8FC08
	for <perforce@freebsd.org>; Thu, 13 Oct 2011 14:41:32 +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 p9DEfWS3080299
	for <perforce@freebsd.org>; Thu, 13 Oct 2011 14:41:32 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9DEfWP4080296
	for perforce@freebsd.org; Thu, 13 Oct 2011 14:41:32 GMT
	(envelope-from jhb@freebsd.org)
Date: Thu, 13 Oct 2011 14:41:32 GMT
Message-Id: <201110131441.p9DEfWP4080296@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 200153 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: Thu, 13 Oct 2011 14:41:33 -0000

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

Change 200153 by jhb@jhb_jhbbsd on 2011/10/13 14:40:35

	Attempt to do fadvise() for writes.

Affected files ...

.. //depot/projects/fadvise/sys/kern/vfs_vnops.c#3 edit

Differences ...

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

@@ -605,7 +605,8 @@
 	struct vnode *vp;
 	struct mount *mp;
 	int error, ioflag, lock_flags;
-	int vfslocked;
+	struct mtx *mtxp;
+	int advice, vfslocked;
 
 	KASSERT(uio->uio_td == td, ("uio_td %p is not td %p",
 	    uio->uio_td, td));
@@ -639,7 +640,32 @@
 	vn_lock(vp, lock_flags | LK_RETRY);
 	if ((flags & FOF_OFFSET) == 0)
 		uio->uio_offset = fp->f_offset;
-	ioflag |= sequential_heuristic(uio, fp);
+	advice = FADV_NORMAL;
+	if (fp->f_advice != FADV_NORMAL) {
+		mtxp = mtx_pool_find(mtxpool_sleep, fp);
+		mtx_lock(mtxp);
+		if (fp->f_advice != FADV_NORMAL &&
+		    uio->uio_offset >= fp->f_advstart &&
+		    uio->uio_offset + uio->uio_resid <= fp->f_advend)
+			advice = fp->f_advice;
+		mtx_unlock(mtxp);
+	}
+	switch (advice) {
+	case FADV_NORMAL:
+	case FADV_SEQUENTIAL:
+		ioflag |= sequential_heuristic(uio, fp);
+	case FADV_RANDOM:
+		/* XXX: Is this correct? */
+		break;
+	case FADV_NOREUSE:
+		/*
+		 * Request the underlying FS to discard the pages
+		 * after the I/O is complete.
+		 */
+		ioflag |= IO_DIRECT;
+		break;
+	}
+
 #ifdef MAC
 	error = mac_vnode_check_write(active_cred, fp->f_cred, vp);
 	if (error == 0)