summaryrefslogtreecommitdiff
path: root/sys/ufs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ext2fs/ext2fs_vnops.c10
-rw-r--r--sys/ufs/ufs/ufs_vnops.c13
2 files changed, 2 insertions, 21 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c
index bb68bce04df..ba9d53f3fd3 100644
--- a/sys/ufs/ext2fs/ext2fs_vnops.c
+++ b/sys/ufs/ext2fs/ext2fs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_vnops.c,v 1.83 2018/06/07 13:37:28 visa Exp $ */
+/* $OpenBSD: ext2fs_vnops.c,v 1.84 2018/06/21 14:17:23 visa Exp $ */
/* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */
/*
@@ -1013,14 +1013,6 @@ ext2fs_rmdir(void *v)
ip = VTOI(vp);
dp = VTOI(dvp);
/*
- * No rmdir "." please.
- */
- if (dp == ip) {
- vrele(dvp);
- vput(vp);
- return (EINVAL);
- }
- /*
* Verify the directory is empty (and valid).
* (Rmdir ".." won't be valid since
* ".." will contain a reference to
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index b984a4c1c89..20f2a179e6b 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.141 2018/06/13 14:57:24 visa Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.142 2018/06/21 14:17:23 visa Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -1293,17 +1293,6 @@ ufs_rmdir(void *v)
ip = VTOI(vp);
dp = VTOI(dvp);
/*
- * No rmdir ".".
- */
- if (dp == ip) {
- if (dp == ip)
- vrele(dvp);
- else
- vput(dvp);
- vput(vp);
- return (EINVAL);
- }
- /*
* Do not remove a directory that is in the process of being renamed.
* Verify the directory is empty (and valid). Rmdir ".." will not be
* valid since ".." will contain a reference to the current directory