diff options
| author |   visa <visa@openbsd.org> | 2018-06-13 14:57:24 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2018-06-13 14:57:24 +0000 |
| commit | b1caf6da48fa20cadf0aec13a254a8e1649fae47 (patch) | |
| tree | ea4f106f1aad126789bc991368643a7fb6961c78 /sys/ufs | |
| parent | Remove #ifdef PASSWD, it was always enabled and is a leftover from krb5 days. (diff) | |
| download | wireguard-openbsd-b1caf6da48fa20cadf0aec13a254a8e1649fae47.tar.xz wireguard-openbsd-b1caf6da48fa20cadf0aec13a254a8e1649fae47.zip | |
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.c | 6 |
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 |