Module Name: src
Committed By: riastradh
Date: Wed Oct 26 23:40:08 UTC 2022
Modified Files:
src/sys/kern: vfs_init.c vfs_vnode.c
src/sys/miscfs/specfs: specdev.h
Log Message:
miscfs/specfs/specdev.h: New home for extern spec_vnodeop_opv_desc.
Also use it for extern spec_vnodeop_p, which is already there.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/kern/vfs_init.c
cvs rdiff -u -r1.146 -r1.147 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.52 -r1.53 src/sys/miscfs/specfs/specdev.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_init.c
diff -u src/sys/kern/vfs_init.c:1.56 src/sys/kern/vfs_init.c:1.57
--- src/sys/kern/vfs_init.c:1.56 Wed Oct 26 23:39:43 2022
+++ src/sys/kern/vfs_init.c Wed Oct 26 23:40:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_init.c,v 1.56 2022/10/26 23:39:43 riastradh Exp $ */
+/* $NetBSD: vfs_init.c,v 1.57 2022/10/26 23:40:08 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v 1.56 2022/10/26 23:39:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v 1.57 2022/10/26 23:40:08 riastradh Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -86,6 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v
#include <sys/kauth.h>
#include <miscfs/deadfs/deadfs.h>
+#include <miscfs/specfs/specdev.h>
/*
* Sigh, such primitive tools are these...
@@ -109,7 +110,6 @@ extern const struct vnodeop_desc * const
* be initialized by vfs_attach().
*/
extern const struct vnodeopv_desc fifo_vnodeop_opv_desc;
-extern const struct vnodeopv_desc spec_vnodeop_opv_desc;
const struct vnodeopv_desc * const vfs_special_vnodeopv_descs[] = {
&dead_vnodeop_opv_desc,
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.146 src/sys/kern/vfs_vnode.c:1.147
--- src/sys/kern/vfs_vnode.c:1.146 Wed Oct 26 23:39:43 2022
+++ src/sys/kern/vfs_vnode.c Wed Oct 26 23:40:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.146 2022/10/26 23:39:43 riastradh Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.147 2022/10/26 23:40:08 riastradh Exp $ */
/*-
* Copyright (c) 1997-2011, 2019, 2020 The NetBSD Foundation, Inc.
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.146 2022/10/26 23:39:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.147 2022/10/26 23:40:08 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -177,6 +177,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,
#include <sys/fstrans.h>
#include <miscfs/deadfs/deadfs.h>
+#include <miscfs/specfs/specdev.h>
#include <uvm/uvm.h>
#include <uvm/uvm_readahead.h>
@@ -226,7 +227,6 @@ static void vnpanic(vnode_t *, const ch
__printflike(2, 3);
/* Routines having to do with the management of the vnode table. */
-extern int (**spec_vnodeop_p)(void *);
/*
* The high bit of v_usecount is a gate for vcache_tryvget(). It's set
Index: src/sys/miscfs/specfs/specdev.h
diff -u src/sys/miscfs/specfs/specdev.h:1.52 src/sys/miscfs/specfs/specdev.h:1.53
--- src/sys/miscfs/specfs/specdev.h:1.52 Mon Mar 28 12:38:04 2022
+++ src/sys/miscfs/specfs/specdev.h Wed Oct 26 23:40:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: specdev.h,v 1.52 2022/03/28 12:38:04 riastradh Exp $ */
+/* $NetBSD: specdev.h,v 1.53 2022/10/26 23:40:08 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -104,6 +104,7 @@ void spec_node_revoke(vnode_t *);
/*
* Prototypes for special file operations on vnodes.
*/
+extern const struct vnodeopv_desc spec_vnodeop_opv_desc;
extern int (**spec_vnodeop_p)(void *);
struct nameidata;
struct componentname;
@@ -175,7 +176,7 @@ int spec_advlock(void *);
* spec_foo. For fsync it varies, but should always also call spec_fsync.
*
* Note that because the op descriptor tables are unordered it does not
- * matter where in the table this macro goes (except I think default
+ * matter where in the table this macro goes (except I think default
* still needs to be first...)
*/
#define GENFS_SPECOP_ENTRIES \
