From owner-p4-projects@FreeBSD.ORG  Fri Jun  8 18:10:30 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F089B1065672; Fri,  8 Jun 2012 18:10:29 +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 B10B8106566C
	for <perforce@freebsd.org>; Fri,  8 Jun 2012 18:10: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 9B83E8FC12
	for <perforce@freebsd.org>; Fri,  8 Jun 2012 18:10: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 q58IATAm027979
	for <perforce@freebsd.org>; Fri, 8 Jun 2012 18:10:29 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q58IATWe027971
	for perforce@freebsd.org; Fri, 8 Jun 2012 18:10:29 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 8 Jun 2012 18:10:29 GMT
Message-Id: <201206081810.q58IATWe027971@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 212483 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: Fri, 08 Jun 2012 18:10:30 -0000

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

Change 212483 by jhb@jhb_jhbbsd on 2012/06/08 18:09:56

	Revert this closer to stock and the simple implementation of
	WILLNEED for FFS.

Affected files ...

.. //depot/projects/fadvise/sys/ufs/ffs/ffs_vnops.c#7 edit

Differences ...

==== //depot/projects/fadvise/sys/ufs/ffs/ffs_vnops.c#7 (text+ko) ====

@@ -422,6 +422,7 @@
 	int xfersize;
 
 	switch (ap->a_advice) {
+#if 0
 	case POSIX_FADV_DONTNEED:
 		/*
 		 * Trim requests to only cover full blocks to avoid
@@ -472,6 +473,7 @@
 		}
 		VOP_UNLOCK(vp, 0);
 		return (0);
+#endif
 	case POSIX_FADV_WILLNEED:
 		vp = ap->a_vp;
 		start = ap->a_start;
@@ -492,10 +494,12 @@
 		resid = end - start + 1;
 		fs = ip->i_fs;
 
+#if 0
 		/* HACK: Prefetch indirect blocks for this range. */
 		endblkno = lblkno(fs, end);
 		for (lbn = NDADDR; lbn < endblkno; lbn += NINDIR(fs))
 			breada(vp, &lbn, &fs->fs_bsize, 1, NOCRED);
+#endif
 
 		while (resid > 0) {
 			/* Limit the number of read ahead buffers. */
@@ -504,12 +508,16 @@
 			lbn = lblkno(fs, start);
 			size = blksize(fs, ip, lbn);
 			blkoffset = blkoff(fs, start);
+#if 0
 			if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0) {
 				resid += blkoffset;
 				start -= blkoffset;
 				xfersize = cluster_readahead(vp, ip->i_size,
 				    lbn, size);
 			} else {
+#else
+			if (1) {
+#ebduf
 				xfersize = fs->fs_bsize - blkoffset;
 				if (resid < xfersize)
 					xfersize = resid;