Module Name: src
Committed By: riastradh
Date: Mon Mar 28 12:36:18 UTC 2022
Modified Files:
src/sys/miscfs/specfs: spec_vnops.c
Log Message:
specfs: Omit needless vdead_check in spec_fdiscard.
The vnode lock is held, so the vnode cannot be revoked without also
changing v_op so subsequent uses under the vnode lock will go to
deadfs's VOP_FDISCARD instead (which is genfs_eopnotsupp).
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/miscfs/specfs/spec_vnops.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/miscfs/specfs/spec_vnops.c
diff -u src/sys/miscfs/specfs/spec_vnops.c:1.198 src/sys/miscfs/specfs/spec_vnops.c:1.199
--- src/sys/miscfs/specfs/spec_vnops.c:1.198 Mon Mar 28 12:36:09 2022
+++ src/sys/miscfs/specfs/spec_vnops.c Mon Mar 28 12:36:18 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: spec_vnops.c,v 1.198 2022/03/28 12:36:09 riastradh Exp $ */
+/* $NetBSD: spec_vnops.c,v 1.199 2022/03/28 12:36:18 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.198 2022/03/28 12:36:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spec_vnops.c,v 1.199 2022/03/28 12:36:18 riastradh Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -945,17 +945,7 @@ spec_fdiscard(void *v)
dev_t dev;
vp = ap->a_vp;
- dev = NODEV;
-
- mutex_enter(vp->v_interlock);
- if (vdead_check(vp, VDEAD_NOWAIT) == 0 && vp->v_specnode != NULL) {
- dev = vp->v_rdev;
- }
- mutex_exit(vp->v_interlock);
-
- if (dev == NODEV) {
- return ENXIO;
- }
+ dev = vp->v_rdev;
switch (vp->v_type) {
case VCHR:
