--- src/sys/vfs/ufs/ufs_inode.c	2006/05/06 02:43:14	1.18
+++ src/sys/vfs/ufs/ufs_inode.c	2006/05/26 17:07:48	1.19
@@ -53,6 +53,7 @@
 #include "inode.h"
 #include "ufsmount.h"
 #include "ufs_extern.h"
+#include "ffs_extern.h"
 #ifdef UFS_DIRHASH
 #include "dir.h"
 #include "dirhash.h"
@@ -85,15 +86,15 @@ ufs_inactive(struct vop_inactive_args *a
 		if (!ufs_getinoquota(ip))
 			(void)ufs_chkiq(ip, -1, NOCRED, FORCE);
 #endif
-		error = UFS_TRUNCATE(vp, (off_t)0, 0, NOCRED);
+		error = ffs_truncate(vp, (off_t)0, 0, NOCRED);
 		ip->i_rdev = 0;
 		mode = ip->i_mode;
 		ip->i_mode = 0;
 		ip->i_flag |= IN_CHANGE | IN_UPDATE;
-		UFS_VFREE(vp, ip->i_number, mode);
+		ffs_vfree(vp, ip->i_number, mode);
 	}
 	if (ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE))
-		UFS_UPDATE(vp, 0);
+		ffs_update(vp, 0);
 out:
 	/*
 	 * If we are done with the inode, reclaim it
@@ -133,14 +134,14 @@ ufs_reclaim(struct vop_reclaim_args *ap)
 		}
 		if (ip->i_flag & IN_LAZYMOD) {
 			ip->i_flag |= IN_MODIFIED;
-			UFS_UPDATE(vp, 0);
+			ffs_update(vp, 0);
 		}
 	}
 #ifdef INVARIANTS
 	if (ip && (ip->i_flag & (IN_ACCESS | IN_CHANGE | IN_MODIFIED | IN_UPDATE))) {
 		printf("WARNING: INODE %ld flags %08x: modified inode being released!\n", (long)ip->i_number, (int)ip->i_flag);
 		ip->i_flag |= IN_MODIFIED;
-		UFS_UPDATE(vp, 0);
+		ffs_update(vp, 0);
 	}
 #endif
 	/*