diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2022-04-13 00:47:45 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2022-04-19 20:22:54 +0000 |
| commit | 6daddc54debbf590cae17bead4864c7f640c07d0 (patch) | |
| tree | 5308dc1c2cb7b65259763e90967b4fe1f52f0d3f | |
| parent | 06394327dd1fd77c66af06f6f89713c5142fe1b2 (diff) | |
Mostly revert a5970a529c2d95271: Make files opened with O_PATH to not block non-forced unmount
(cherry picked from commit bf13db086b84c29ce901145f2800c561dcbf4d1e)
| -rw-r--r-- | lib/libc/sys/open.2 | 5 | ||||
| -rw-r--r-- | sys/kern/kern_descrip.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/lib/libc/sys/open.2 b/lib/libc/sys/open.2 index f6b061079ddf..876a4ce1e57d 100644 --- a/lib/libc/sys/open.2 +++ b/lib/libc/sys/open.2 @@ -28,7 +28,7 @@ .\" @(#)open.2 8.2 (Berkeley) 11/16/93 .\" $FreeBSD$ .\" -.Dd October 9, 2021 +.Dd April 22, 2022 .Dt OPEN 2 .Os .Sh NAME @@ -351,9 +351,6 @@ But operations like and any other that operate on file and not on file descriptor (except .Xr fstat 2 ), are not allowed. -File opened with the -.Dv O_PATH -flag does not prevent non-forced unmount of the volume it belongs to. .Pp A file descriptor created with the .Dv O_PATH diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index b4bb74e02c4e..fe5103fc35d9 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -5215,7 +5215,7 @@ path_close(struct file *fp, struct thread *td) { MPASS(fp->f_type == DTYPE_VNODE); fp->f_ops = &badfileops; - vdrop(fp->f_vnode); + vrele(fp->f_vnode); return (0); } diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 32868eb7a4d5..d90dd72c8ead 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1208,8 +1208,6 @@ kern_openat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, if ((flags & O_PATH) != 0) { finit(fp, (flags & FMASK) | (fp->f_flag & FKQALLOWED), DTYPE_VNODE, NULL, &path_fileops); - vhold(vp); - vunref(vp); } else { finit_vnode(fp, flags, NULL, &vnops); } |