D60137.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D60137.id.diff
View Options

	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
	@@ -1246,6 +1246,8 @@
	error = UFS_BLKATOFF(vdp, (off_t)I_OFFSET(dp), (char **)&ep, &bp);
	if (error == 0 && ep->d_namlen == 2 && ep->d_name[1] == '.' &&
	ep->d_name[0] == '.' && ep->d_ino != oip->i_number) {
	+ ufs_dirbad(dp, I_OFFSET(dp),
	+ "rewrite: .. entry does not name the expected inode");
	brelse(bp);
	error = EIDRM;
	}
	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
	@@ -1749,9 +1749,7 @@
	/* Journal must account for each new link. */
	softdep_setup_dotdot_link(tdp, fip);
	SET_I_OFFSET(fip, mastertemplate.dot_reclen);
	- if (ufs_dirrewrite(fip, fdp, newparent, DT_DIR, 0) != 0)
	- ufs_dirbad(fip, mastertemplate.dot_reclen,
	- "rename: missing .. entry");
	+ (void)ufs_dirrewrite(fip, fdp, newparent, DT_DIR, 0);
	cache_purge(fdvp);
	}
	error = ufs_dirremove(fdvp, fip, fcnp->cn_flags, false);