Module Name: src
Committed By: riastradh
Date: Sun Feb 23 08:41:08 UTC 2020
Modified Files:
src/sys/ufs/lfs: lfs_rename.c
Log Message:
Call lfs_orphan in lfs_rename while we're still in the dirop.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/ufs/lfs/lfs_rename.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_rename.c
diff -u src/sys/ufs/lfs/lfs_rename.c:1.22 src/sys/ufs/lfs/lfs_rename.c:1.23
--- src/sys/ufs/lfs/lfs_rename.c:1.22 Sat Jun 10 05:29:36 2017
+++ src/sys/ufs/lfs/lfs_rename.c Sun Feb 23 08:41:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_rename.c,v 1.22 2017/06/10 05:29:36 maya Exp $ */
+/* $NetBSD: lfs_rename.c,v 1.23 2020/02/23 08:41:07 riastradh Exp $ */
/* from NetBSD: ufs_rename.c,v 1.12 2015/03/27 17:27:56 riastradh Exp */
/*-
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.22 2017/06/10 05:29:36 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.23 2020/02/23 08:41:07 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1061,6 +1061,9 @@ lfs_gro_rename(struct mount *mp, kauth_c
fdvp, fcnp, fde, fvp,
tdvp, tcnp, tde, tvp);
+ if (tvp && VTOI(tvp)->i_nlink == 0)
+ lfs_orphan(VTOI(tvp)->i_lfs, VTOI(tvp)->i_number);
+
UNMARK_VNODE(fdvp);
UNMARK_VNODE(fvp);
UNMARK_VNODE(tdvp);
