X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_object.c;h=2413da9498cd3f90704b75579cdc8179f1592d10;hp=4abf00880e7aefc1818969c57ca8f8f500f26c8c;hb=e423a0bd7a4a59be80e2011e62818b2f839fb246;hpb=83ddd179225821e5c2aee1adb72dab26150ab385

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 4abf008..2413da9 100644
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -66,8 +66,7 @@ static int vvp_object_print(const struct lu_env *env, void *cookie,
 	struct inode         *inode = obj->vob_inode;
 	struct ll_inode_info *lli;
 
-	(*p)(env, cookie, "(%d %d) inode: %p ",
-	     atomic_read(&obj->vob_transient_pages),
+	(*p)(env, cookie, "(%d) inode: %p ",
 	     atomic_read(&obj->vob_mmap_cnt),
 	     inode);
 	if (inode) {
@@ -167,13 +166,8 @@ static int vvp_prune(const struct lu_env *env, struct cl_object *obj)
 		RETURN(rc);
 	}
 
-	truncate_inode_pages(inode->i_mapping, 0);
-	if (inode->i_mapping->nrpages) {
-		CDEBUG(D_VFSTRACE, DFID ": still has %lu pages remaining\n",
-		       PFID(lu_object_fid(&obj->co_lu)),
-		       inode->i_mapping->nrpages);
-		RETURN(-EIO);
-	}
+	ll_truncate_inode_pages_final(inode);
+	mapping_clear_exiting(inode->i_mapping);
 
 	RETURN(0);
 }
@@ -239,7 +233,6 @@ static int vvp_object_init0(const struct lu_env *env,
 			    const struct cl_object_conf *conf)
 {
 	vob->vob_inode = conf->coc_inode;
-	atomic_set(&vob->vob_transient_pages, 0);
 	cl_object_page_init(&vob->vob_cl, sizeof(struct vvp_page));
 	return 0;
 }