diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -274,7 +274,7 @@
 softdep_setup_remove(struct buf *bp,
 	struct inode *dp,
 	struct inode *ip,
-	int isrmdir)
+	bool isrmdir)
 {
 
 	panic("softdep_setup_remove called");
@@ -285,7 +285,7 @@
 	struct inode *dp,
 	struct inode *ip,
 	ino_t newinum,
-	int isrmdir)
+	u_int newparent)
 {
 
 	panic("softdep_setup_directory_change called");
@@ -765,7 +765,7 @@
 static	void handle_workitem_freefile(struct freefile *);
 static	int handle_workitem_remove(struct dirrem *, int);
 static	struct dirrem *newdirrem(struct buf *, struct inode *,
-	    struct inode *, int, struct dirrem **);
+	    struct inode *, bool, struct dirrem **);
 static	struct indirdep *indirdep_lookup(struct mount *, struct inode *,
 	    struct buf *);
 static	void cancel_indirdep(struct indirdep *, struct buf *,
@@ -9169,7 +9169,7 @@
 	struct buf *bp,		/* buffer containing directory block */
 	struct inode *dp,	/* inode for the directory being modified */
 	struct inode *ip,	/* inode for directory entry being removed */
-	int isrmdir)		/* indicates if doing RMDIR */
+	bool isrmdir)		/* indicates if doing RMDIR */
 {
 	struct dirrem *dirrem, *prevdirrem;
 	struct inodedep *inodedep;
@@ -9361,7 +9361,7 @@
 	struct buf *bp,		/* buffer containing directory block */
 	struct inode *dp,	/* inode for the directory being modified */
 	struct inode *ip,	/* inode for directory entry being removed */
-	int isrmdir,		/* indicates if doing RMDIR */
+	bool isrmdir,		/* indicates if doing RMDIR */
 	struct dirrem **prevdirremp) /* previously referenced inode, if any */
 {
 	int offset;
@@ -9490,7 +9490,7 @@
 	dirrem->dm_state |= COMPLETE;
 	cancel_diradd(dap, dirrem, jremref, dotremref, dotdotremref);
 #ifdef INVARIANTS
-	if (isrmdir == 0) {
+	if (!isrmdir) {
 		struct worklist *wk;
 
 		LIST_FOREACH(wk, &dirrem->dm_jwork, wk_list)
@@ -9525,7 +9525,7 @@
 	struct inode *dp,	/* inode for the directory being modified */
 	struct inode *ip,	/* inode for directory entry being removed */
 	ino_t newinum,		/* new inode number for changed entry */
-	int isrmdir)		/* indicates if doing RMDIR */
+	u_int newparent)	/* indicates if doing RMDIR */
 {
 	int offset;
 	struct diradd *dap = NULL;
@@ -9558,10 +9558,10 @@
 	/*
 	 * Allocate a new dirrem and ACQUIRE_LOCK.
 	 */
-	dirrem = newdirrem(bp, dp, ip, isrmdir, &prevdirrem);
+	dirrem = newdirrem(bp, dp, ip, newparent != 0, &prevdirrem);
 	pagedep = dirrem->dm_pagedep;
 	/*
-	 * The possible values for isrmdir:
+	 * The possible values for newparent:
 	 *	0 - non-directory file rename
 	 *	1 - directory rename within same directory
 	 *   inum - directory rename to new directory of given inode number
@@ -9572,7 +9572,7 @@
 	 * the DIRCHG flag to tell handle_workitem_remove to skip the 
 	 * followup dirrem.
 	 */
-	if (isrmdir > 1)
+	if (newparent > 1)
 		dirrem->dm_state |= DIRCHG;
 
 	/*
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -66,8 +66,8 @@
 	    struct direct *);
 int	 ufs_direnter(struct vnode *, struct vnode *, struct direct *,
 	    struct componentname *, struct buf *);
-int	 ufs_dirremove(struct vnode *, struct inode *, int, int);
-int	 ufs_dirrewrite(struct inode *, struct inode *, ino_t, int, int);
+int	 ufs_dirremove(struct vnode *, struct inode *, int, bool);
+int	 ufs_dirrewrite(struct inode *, struct inode *, ino_t, int, u_int);
 int	 ufs_lookup_ino(struct vnode *, struct vnode **, struct componentname *,
 	    ino_t *);
 int	 ufs_getlbns(struct vnode *, ufs2_daddr_t, struct indir *, int *);
@@ -93,9 +93,9 @@
 	    ino_t, struct buf *, int);
 void	softdep_change_directoryentry_offset(struct buf *, struct inode *,
 	    caddr_t, caddr_t, caddr_t, int);
-void	softdep_setup_remove(struct buf *,struct inode *, struct inode *, int);
+void	softdep_setup_remove(struct buf *,struct inode *, struct inode *, bool);
 void	softdep_setup_directory_change(struct buf *, struct inode *,
-	    struct inode *, ino_t, int);
+	    struct inode *, ino_t, u_int);
 void	softdep_change_linkcnt(struct inode *);
 int	softdep_slowdown(struct vnode *);
 void	softdep_setup_create(struct inode *, struct inode *);
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -1101,7 +1101,7 @@
  * to the size of the previous entry.
  */
 int
-ufs_dirremove(struct vnode *dvp, struct inode *ip, int flags, int isrmdir)
+ufs_dirremove(struct vnode *dvp, struct inode *ip, int flags, bool isrmdir)
 {
 	struct inode *dp;
 	struct direct *ep, *rep;
@@ -1224,7 +1224,7 @@
  */
 int
 ufs_dirrewrite(struct inode *dp, struct inode *oip, ino_t newinum, int newtype,
-    int isrmdir)
+    u_int newparent)
 {
 	struct buf *bp;
 	struct direct *ep;
@@ -1267,7 +1267,8 @@
 	if (!OFSFMT(vdp))
 		ep->d_type = newtype;
 	if (DOINGSOFTDEP(vdp)) {
-		softdep_setup_directory_change(bp, dp, oip, newinum, isrmdir);
+		softdep_setup_directory_change(bp, dp, oip, newinum,
+		    newparent);
 		bdwrite(bp);
 	} else {
 		if (DOINGASYNC(vdp)) {
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1051,7 +1051,7 @@
 #ifdef UFS_GJOURNAL
 	ufs_gjournal_orphan(vp);
 #endif
-	error = ufs_dirremove(dvp, ip, ap->a_cnp->cn_flags, 0);
+	error = ufs_dirremove(dvp, ip, ap->a_cnp->cn_flags, false);
 	if (ip->i_nlink <= 0)
 		vp->v_vflag |= VV_NOSYNC;
 	if (IS_SNAPSHOT(ip)) {
@@ -1209,7 +1209,7 @@
 #endif
 
 		cnp->cn_flags &= ~DOWHITEOUT;
-		error = ufs_dirremove(dvp, NULL, cnp->cn_flags, 0);
+		error = ufs_dirremove(dvp, NULL, cnp->cn_flags, false);
 		break;
 	default:
 		panic("ufs_whiteout: unknown op");
@@ -1728,7 +1728,7 @@
 			    "rename: missing .. entry");
 		cache_purge(fdvp);
 	}
-	error = ufs_dirremove(fdvp, fip, fcnp->cn_flags, 0);
+	error = ufs_dirremove(fdvp, fip, fcnp->cn_flags, false);
 	/*
 	 * The kern_renameat() looks up the fvp using the DELETE flag, which
 	 * causes the removal of the name cache entry for fvp.
@@ -2309,7 +2309,7 @@
 	ip->i_effnlink--;
 	if (DOINGSOFTDEP(vp))
 		softdep_setup_rmdir(dp, ip);
-	error = ufs_dirremove(dvp, ip, cnp->cn_flags, 1);
+	error = ufs_dirremove(dvp, ip, cnp->cn_flags, true);
 	if (error) {
 		dp->i_effnlink++;
 		ip->i_effnlink++;