From 804588bd3862bd4028f94b1d74ec84a440f07c45 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Wed, 9 Mar 2016 17:53:25 -0800 Subject: [PATCH 11/16] Remove vm_object_cache_is_empty(). --- sys/cddl/compat/opensolaris/sys/vnode.h | 4 +--- sys/vm/vm_object.c | 3 --- sys/vm/vm_object.h | 7 ------- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/cddl/compat/opensolaris/sys/vnode.h b/sys/cddl/compat/opensolaris/sys/vnode.h index d7bc7f7..2888e0f 100644 --- a/sys/cddl/compat/opensolaris/sys/vnode.h +++ b/sys/cddl/compat/opensolaris/sys/vnode.h @@ -74,9 +74,7 @@ vn_is_readonly(vnode_t *vp) #define vn_ismntpt(vp) ((vp)->v_type == VDIR && (vp)->v_mountedhere != NULL) #define vn_mountedvfs(vp) ((vp)->v_mountedhere) #define vn_has_cached_data(vp) \ - ((vp)->v_object != NULL && \ - ((vp)->v_object->resident_page_count > 0 || \ - !vm_object_cache_is_empty((vp)->v_object))) + ((vp)->v_object != NULL && (vp)->v_object->resident_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) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 81205d2..c831494 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -178,9 +178,6 @@ vm_object_zdtor(void *mem, int size, void *arg) ("object %p has reservations", object)); #endif - KASSERT(vm_object_cache_is_empty(object), - ("object %p has cached pages", - object)); KASSERT(object->paging_in_progress == 0, ("object %p paging_in_progress = %d", object, object->paging_in_progress)); diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index c68fdce..7eae6cb 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -291,13 +291,6 @@ void vm_object_pip_wakeup(vm_object_t object); void vm_object_pip_wakeupn(vm_object_t object, short i); void vm_object_pip_wait(vm_object_t object, char *waitid); -static __inline boolean_t -vm_object_cache_is_empty(vm_object_t object) -{ - - return (vm_radix_is_empty(&object->cache)); -} - void umtx_shm_object_init(vm_object_t object); void umtx_shm_object_terminated(vm_object_t object); -- 2.8.1