svn commit: r228316 - in user/attilio/vmcontention/sys/cddl: compat/opensolaris/sys contrib/opensolaris/uts/common/fs/zfs

[Attilio Rao]

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);