summaryrefslogtreecommitdiff
path: root/sys/ufs
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2018-06-13 14:57:25 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2018-06-13 14:57:25 +0000
commit25b20365f4e56014a5163a4575972fa6fe78a7bb (patch)
tree44724cc8dd4c3efff0a5bd4c64a3855f777bd01b /sys/ufs
parentba87deb84f5c065689790253603df13d32588fdc (diff)
Make the VFS layer responsible for preventing the deletion
of mounted on directories. OK guenther@, mpi@
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ufs/ufs_vnops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index af02be00587..b984a4c1c89 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_vnops.c,v 1.140 2018/06/07 13:37:28 visa Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.141 2018/06/13 14:57:24 visa Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -1293,9 +1293,9 @@ ufs_rmdir(void *v)
ip = VTOI(vp);
dp = VTOI(dvp);
/*
- * No rmdir "." or of mounted on directories.
+ * No rmdir ".".
*/
- if (dp == ip || vp->v_mountedhere != NULL) {
+ if (dp == ip) {
if (dp == ip)
vrele(dvp);
else