1) Converted v_vmdata to v_object.

2) Removed unnecessary vm_object_lookup()/pager_cache(object, TRUE) pairs
   after vnode_pager_alloc() calls - the object is already guaranteed to be
   persistent.
3) Removed some gratuitous casts.

2 files changed, 7 insertions, 7 deletions

diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 6622113..aaebccf 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vfsops.c	8.8 (Berkeley) 4/18/94
- * $Id: ffs_vfsops.c,v 1.20 1995/05/19 03:26:56 davidg Exp $
+ * $Id: ffs_vfsops.c,v 1.21 1995/05/30 08:15:03 rgrimes Exp $
  */
 
 #include <sys/param.h>
@@ -698,11 +698,11 @@ loop:
 		if (VOP_ISLOCKED(vp))
 			continue;
 		ip = VTOI(vp);
-		if (vp->v_vmdata &&
-		   (((vm_object_t) vp->v_vmdata)->flags & OBJ_WRITEABLE)) {
+		if (vp->v_object &&
+		   (((vm_object_t) vp->v_object)->flags & OBJ_WRITEABLE)) {
 			if (vget(vp, 1))
 				goto loop;
-			_vm_object_page_clean( (vm_object_t) vp->v_vmdata,
+			_vm_object_page_clean(vp->v_object,
 						0, 0, 0);
 			vput(vp);
 		}
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index 3aea1ec..644f464 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vnops.c	8.5 (Berkeley) 12/30/93
- * $Id: lfs_vnops.c,v 1.9 1995/05/30 08:15:27 rgrimes Exp $
+ * $Id: lfs_vnops.c,v 1.10 1995/06/28 07:06:53 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -238,8 +238,8 @@ lfs_fsync(ap)
 	 * If the vnode has an object, then flush all of the dirty pages
 	 * into the buffer cache.
 	 */
-	if (ap->a_vp->v_vmdata)
-		_vm_object_page_clean((vm_object_t)ap->a_vp->v_vmdata, 0, 0, 0);
+	if (ap->a_vp->v_object)
+		_vm_object_page_clean(ap->a_vp->v_object, 0, 0, 0);
 
 	error = (VOP_UPDATE(ap->a_vp, &tv, &tv,
 	    ap->a_waitfor == MNT_WAIT ? LFS_SYNC : 0));