Module Name: src
Committed By: riastradh
Date: Wed Oct 26 23:40:20 UTC 2022
Modified Files:
src/sys/kern: vfs_init.c
src/sys/miscfs/fifofs: fifo.h
Log Message:
miscfs/fifofs/fifo.h: New home for extern fifo_vnodeop_opv_desc.
Add include guard and fix missing includes while here too.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/kern/vfs_init.c
cvs rdiff -u -r1.27 -r1.28 src/sys/miscfs/fifofs/fifo.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.57 src/sys/kern/vfs_init.c:1.58
--- src/sys/kern/vfs_init.c:1.57 Wed Oct 26 23:40:08 2022
+++ src/sys/kern/vfs_init.c Wed Oct 26 23:40:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_init.c,v 1.57 2022/10/26 23:40:08 riastradh Exp $ */
+/* $NetBSD: vfs_init.c,v 1.58 2022/10/26 23:40:20 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.57 2022/10/26 23:40:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v 1.58 2022/10/26 23:40:20 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/fifofs/fifo.h>
#include <miscfs/specfs/specdev.h>
/*
@@ -109,8 +110,6 @@ extern const struct vnodeop_desc * const
* associated with any particular file system, and thus cannot
* be initialized by vfs_attach().
*/
-extern const struct vnodeopv_desc fifo_vnodeop_opv_desc;
-
const struct vnodeopv_desc * const vfs_special_vnodeopv_descs[] = {
&dead_vnodeop_opv_desc,
&fifo_vnodeop_opv_desc,
Index: src/sys/miscfs/fifofs/fifo.h
diff -u src/sys/miscfs/fifofs/fifo.h:1.27 src/sys/miscfs/fifofs/fifo.h:1.28
--- src/sys/miscfs/fifofs/fifo.h:1.27 Sun Jul 18 23:56:13 2021
+++ src/sys/miscfs/fifofs/fifo.h Wed Oct 26 23:40:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fifo.h,v 1.27 2021/07/18 23:56:13 dholland Exp $ */
+/* $NetBSD: fifo.h,v 1.28 2022/10/26 23:40:20 riastradh Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -31,6 +31,15 @@
* @(#)fifo.h 8.6 (Berkeley) 5/21/95
*/
+#ifndef _MISCFS_FIFOFS_FIFO_H_
+#define _MISCFS_FIFOFS_FIFO_H_
+
+#include <sys/vnode.h>
+
+#include <miscfs/genfs/genfs.h>
+
+extern const struct vnodeopv_desc fifo_vnodeop_opv_desc;
+
extern int (**fifo_vnodeop_p)(void *);
/*
@@ -78,7 +87,7 @@ extern int (**fifo_vnodeop_p)(void *);
* fifo_foo (currently via vn_fifo_bypass). For fsync it varies.
*
* 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...)
*
* XXX currently all the ops are vn_fifo_bypass, which does an
@@ -117,3 +126,5 @@ extern int (**fifo_vnodeop_p)(void *);
{ &vop_advlock_desc, vn_fifo_bypass }, /* advlock */ \
{ &vop_getpages_desc, genfs_badop }, /* getpages */ \
{ &vop_putpages_desc, vn_fifo_bypass } /* putpages */
+
+#endif /* _MISCFS_FIFOFS_FIFO_H_ */
