From da0c894f9f0b045d629d6dd1448274bf39becd52 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Thu, 20 Nov 2025 22:25:13 -0500 Subject: kern: Move vnode related files to kern Signed-off-by: Ian Moffett --- sys/inc/kern/vfs.h | 49 +++++++++++++++++++++++++ sys/inc/kern/vnode.h | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ sys/inc/os/mount.h | 2 +- sys/inc/os/vfs.h | 49 ------------------------- sys/inc/os/vnode.h | 100 --------------------------------------------------- sys/kern/kern_init.c | 2 +- sys/kern/vfs_init.c | 2 +- sys/kern/vfs_mount.c | 2 +- sys/kern/vfs_subr.c | 2 +- 9 files changed, 154 insertions(+), 154 deletions(-) create mode 100644 sys/inc/kern/vfs.h create mode 100644 sys/inc/kern/vnode.h delete mode 100644 sys/inc/os/vfs.h delete mode 100644 sys/inc/os/vnode.h (limited to 'sys') diff --git a/sys/inc/kern/vfs.h b/sys/inc/kern/vfs.h new file mode 100644 index 0000000..e5ce607 --- /dev/null +++ b/sys/inc/kern/vfs.h @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _OS_VFS_H_ +#define _OS_VFS_H_ 1 + +#include + +/* + * Initialize the virtual file system + */ +void vfs_init(void); + +/* + * Get a file system information descriptor + * by name + * + * @name: Name to lookup + * @res: Result pointer is written here + */ +int vfs_byname(const char *name, struct fs_info **res); + +#endif /* _!OS_VFS_H_ */ diff --git a/sys/inc/kern/vnode.h b/sys/inc/kern/vnode.h new file mode 100644 index 0000000..4ba5d8e --- /dev/null +++ b/sys/inc/kern/vnode.h @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _OS_VNODE_H_ +#define _OS_VNODE_H_ + +#include + +struct vnode; + +/* + * Valid vnode types + */ +typedef enum { + VREG, + VDIR, + VCHR, + VBLK +} vtype_t; + +/* + * Arguments for the read() operation + */ +struct vop_read_args { + void *buffer; + off_t offset; + size_t len; +}; + +/* + * Operations that can be performed on a vnode + */ +struct vops { + ssize_t(*read)(struct vop_read_args *args); + ssize_t(*write)(struct vop_read_args *args); + void(*reclaim)(struct vnode *vp); +}; + +/* + * A virtual file node is an abstract repre + * + * @type: Vnode type + * @vops: Operations associated with vnode + * @ref: Reference counter + * @data: Filesystem specific data + */ +struct vnode { + vtype_t type; + struct vops vops; + int ref; + void *data; +}; + +/* + * Initialize a vnode by type + * + * @vp_res: Vnode pointer result + * @vtype: Vnode type to initialize + * + * Returns zero on success + */ +int vnode_init(struct vnode **vp_res, vtype_t type); + +/* + * Release a vnode from memory + * + * @vp: Vnode to release from memory + * + * Returns the reference count if not released, zero + * on successful release. + */ +int vnode_release(struct vnode *vp); + +#endif /* !_OS_VNODE_H_ */ diff --git a/sys/inc/os/mount.h b/sys/inc/os/mount.h index 6cfff2f..799c14f 100644 --- a/sys/inc/os/mount.h +++ b/sys/inc/os/mount.h @@ -32,7 +32,7 @@ #include #include -#include +#include /* Filesystem names */ #define MOUNT_TMPFS "tmpfs" diff --git a/sys/inc/os/vfs.h b/sys/inc/os/vfs.h deleted file mode 100644 index e5ce607..0000000 --- a/sys/inc/os/vfs.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Hyra nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _OS_VFS_H_ -#define _OS_VFS_H_ 1 - -#include - -/* - * Initialize the virtual file system - */ -void vfs_init(void); - -/* - * Get a file system information descriptor - * by name - * - * @name: Name to lookup - * @res: Result pointer is written here - */ -int vfs_byname(const char *name, struct fs_info **res); - -#endif /* _!OS_VFS_H_ */ diff --git a/sys/inc/os/vnode.h b/sys/inc/os/vnode.h deleted file mode 100644 index 4ba5d8e..0000000 --- a/sys/inc/os/vnode.h +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Hyra nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _OS_VNODE_H_ -#define _OS_VNODE_H_ - -#include - -struct vnode; - -/* - * Valid vnode types - */ -typedef enum { - VREG, - VDIR, - VCHR, - VBLK -} vtype_t; - -/* - * Arguments for the read() operation - */ -struct vop_read_args { - void *buffer; - off_t offset; - size_t len; -}; - -/* - * Operations that can be performed on a vnode - */ -struct vops { - ssize_t(*read)(struct vop_read_args *args); - ssize_t(*write)(struct vop_read_args *args); - void(*reclaim)(struct vnode *vp); -}; - -/* - * A virtual file node is an abstract repre - * - * @type: Vnode type - * @vops: Operations associated with vnode - * @ref: Reference counter - * @data: Filesystem specific data - */ -struct vnode { - vtype_t type; - struct vops vops; - int ref; - void *data; -}; - -/* - * Initialize a vnode by type - * - * @vp_res: Vnode pointer result - * @vtype: Vnode type to initialize - * - * Returns zero on success - */ -int vnode_init(struct vnode **vp_res, vtype_t type); - -/* - * Release a vnode from memory - * - * @vp: Vnode to release from memory - * - * Returns the reference count if not released, zero - * on successful release. - */ -int vnode_release(struct vnode *vp); - -#endif /* !_OS_VNODE_H_ */ diff --git a/sys/kern/kern_init.c b/sys/kern/kern_init.c index 8f00906..3706dff 100644 --- a/sys/kern/kern_init.c +++ b/sys/kern/kern_init.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 2f282cf..3f9bbb2 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -33,9 +33,9 @@ #include #include #include +#include #include #include -#include #define dtrace(fmt, ...) trace("vfs: " fmt, ##__VA_ARGS__) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index d733a3f..909a618 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 5b53c0a..3fd8503 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -28,7 +28,7 @@ */ #include -#include +#include #include #include -- cgit v1.2.3