From owner-svn-src-user@FreeBSD.ORG  Wed Dec  7 00:22:34 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7200F106564A;
	Wed,  7 Dec 2011 00:22:34 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 60B8C8FC12;
	Wed,  7 Dec 2011 00:22:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB70MYar014415;
	Wed, 7 Dec 2011 00:22:34 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB70MYiY014412;
	Wed, 7 Dec 2011 00:22:34 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201112070022.pB70MYiY014412@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Wed, 7 Dec 2011 00:22:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228316 - in user/attilio/vmcontention/sys/cddl:
	compat/opensolaris/sys contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Dec 2011 00:22:34 -0000

Author: attilio
Date: Wed Dec  7 00:22:34 2011
New Revision: 228316
URL: http://svn.freebsd.org/changeset/base/228316

Log:
  Fix ZFS for compiling on vmcontention branch.

Modified:
  user/attilio/vmcontention/sys/cddl/compat/opensolaris/sys/vnode.h
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: user/attilio/vmcontention/sys/cddl/compat/opensolaris/sys/vnode.h
==============================================================================
--- user/attilio/vmcontention/sys/cddl/compat/opensolaris/sys/vnode.h	Wed Dec  7 00:07:57 2011	(r228315)
+++ user/attilio/vmcontention/sys/cddl/compat/opensolaris/sys/vnode.h	Wed Dec  7 00:22:34 2011	(r228316)
@@ -75,8 +75,7 @@ vn_is_readonly(vnode_t *vp)
 #define	vn_mountedvfs(vp)	((vp)->v_mountedhere)
 #define	vn_has_cached_data(vp)	\
 	((vp)->v_object != NULL && \
-	 ((vp)->v_object->resident_page_count > 0 || \
-	  (vp)->v_object->cache != NULL))
+	 (vp)->v_object->cached_page_count > 0)
 #define	vn_exists(vp)		do { } while (0)
 #define	vn_invalid(vp)		do { } while (0)
 #define	vn_renamepath(tdvp, svp, tnm, lentnm)	do { } while (0)

Modified: user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Wed Dec  7 00:07:57 2011	(r228315)
+++ user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Wed Dec  7 00:22:34 2011	(r228316)
@@ -337,13 +337,8 @@ page_lookup(vnode_t *vp, int64_t start, 
 			}
 			vm_page_busy(pp);
 			vm_page_undirty(pp);
-		} else {
-			if (__predict_false(obj->cache != NULL)) {
-				vm_page_cache_free(obj, OFF_TO_IDX(start),
-				    OFF_TO_IDX(start) + 1);
-			}
+		} else
 			pp = NULL;
-		}
 		break;
 	}
 	return (pp);