From 8a72ed77efae6220c2c9028454628e0b4294c1a6 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Fri, 21 Nov 2025 13:24:00 -0500 Subject: kern: Move os/mount.h to kern/mount.h Signed-off-by: Ian Moffett --- sys/fs/tmpfs.c | 2 +- sys/inc/fs/tmpfs.h | 2 +- sys/inc/kern/mount.h | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++ sys/inc/kern/vfs.h | 2 +- sys/inc/os/mount.h | 106 -------------------------------------------------- sys/kern/kern_namei.c | 2 +- sys/kern/vfs_init.c | 2 +- sys/kern/vfs_mount.c | 2 +- 8 files changed, 112 insertions(+), 112 deletions(-) create mode 100644 sys/inc/kern/mount.h delete mode 100644 sys/inc/os/mount.h (limited to 'sys') diff --git a/sys/fs/tmpfs.c b/sys/fs/tmpfs.c index 648f60e..cb18b6b 100644 --- a/sys/fs/tmpfs.c +++ b/sys/fs/tmpfs.c @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include /* diff --git a/sys/inc/fs/tmpfs.h b/sys/inc/fs/tmpfs.h index f7a7ece..ba44f74 100644 --- a/sys/inc/fs/tmpfs.h +++ b/sys/inc/fs/tmpfs.h @@ -30,7 +30,7 @@ #ifndef _FS_TMPFS_H_ #define _FS_TMPFS_H_ -#include +#include extern struct vfsops g_tmpfs_ops; diff --git a/sys/inc/kern/mount.h b/sys/inc/kern/mount.h new file mode 100644 index 0000000..1c3dde6 --- /dev/null +++ b/sys/inc/kern/mount.h @@ -0,0 +1,106 @@ +/* + * 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_MOUNT_H_ +#define _OS_MOUNT_H_ 1 + +#include +#include +#include + +/* Filesystem names */ +#define MOUNT_TMPFS "tmpfs" + +struct fs_info; + +/* + * Represents arguments passed to mount() + */ +struct mount_args { + const char *source; + const char *target; + const char *fstype; + uint32_t flags; + void *data; +}; + +/* + * Represents VFS operations that can be performed + * on filesystem objects + */ +struct vfsops { + int(*mount)(struct fs_info *fip, void *data); +}; + +/* + * Represents filesystem operation + * + * @name: Name of filesystem + * @vfsops: Represents operations that can be performed + * @is_mounted: Set if filesystem is mounted + */ +struct fs_info { + char *name; + struct vfsops *vfsops; + uint8_t is_mounted : 1; +}; + +/* + * Represents a mountpoint + * + * @fip: Target filesystem interface + * @vp: Vnode pointer length + * @link: Connects mountpoints + */ +struct mount { + struct fs_info *fip; + struct vnode *vp; + TAILQ_ENTRY(mount) link; +}; + +/* + * Mount a filesystem and make it visible for access + * + * @margs: Mount arguments + * + * Returns zero on success + */ +int mount(struct mount_args *margs); + +/* + * Lookup an entry within the mount table + * + * @name: Name to lookup + * @mres: Result pointer is written here + * + * Returns zero on success + */ +int mount_lookup(const char *name, struct mount **mres); + +#endif /* !_OS_MOUNT_H_ */ diff --git a/sys/inc/kern/vfs.h b/sys/inc/kern/vfs.h index e5ce607..388f3f7 100644 --- a/sys/inc/kern/vfs.h +++ b/sys/inc/kern/vfs.h @@ -30,7 +30,7 @@ #ifndef _OS_VFS_H_ #define _OS_VFS_H_ 1 -#include +#include /* * Initialize the virtual file system diff --git a/sys/inc/os/mount.h b/sys/inc/os/mount.h deleted file mode 100644 index 1c3dde6..0000000 --- a/sys/inc/os/mount.h +++ /dev/null @@ -1,106 +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_MOUNT_H_ -#define _OS_MOUNT_H_ 1 - -#include -#include -#include - -/* Filesystem names */ -#define MOUNT_TMPFS "tmpfs" - -struct fs_info; - -/* - * Represents arguments passed to mount() - */ -struct mount_args { - const char *source; - const char *target; - const char *fstype; - uint32_t flags; - void *data; -}; - -/* - * Represents VFS operations that can be performed - * on filesystem objects - */ -struct vfsops { - int(*mount)(struct fs_info *fip, void *data); -}; - -/* - * Represents filesystem operation - * - * @name: Name of filesystem - * @vfsops: Represents operations that can be performed - * @is_mounted: Set if filesystem is mounted - */ -struct fs_info { - char *name; - struct vfsops *vfsops; - uint8_t is_mounted : 1; -}; - -/* - * Represents a mountpoint - * - * @fip: Target filesystem interface - * @vp: Vnode pointer length - * @link: Connects mountpoints - */ -struct mount { - struct fs_info *fip; - struct vnode *vp; - TAILQ_ENTRY(mount) link; -}; - -/* - * Mount a filesystem and make it visible for access - * - * @margs: Mount arguments - * - * Returns zero on success - */ -int mount(struct mount_args *margs); - -/* - * Lookup an entry within the mount table - * - * @name: Name to lookup - * @mres: Result pointer is written here - * - * Returns zero on success - */ -int mount_lookup(const char *name, struct mount **mres); - -#endif /* !_OS_MOUNT_H_ */ diff --git a/sys/kern/kern_namei.c b/sys/kern/kern_namei.c index ab96f75..7a530d7 100644 --- a/sys/kern/kern_namei.c +++ b/sys/kern/kern_namei.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 3f9bbb2..6372f3d 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -34,7 +34,7 @@ #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 02c7308..51a464a 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3