From 0084d316350b023f6e052ba2581c7d497ffe75fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 15 Nov 2004 16:43:30 +0000 Subject: [PATCH] Added an additional flags parameter to fs_mount(), "args" is now a const char. Turned off debugging output in pipefs. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9951 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/core/fs/bootfs.c | 3 ++- src/kernel/core/fs/devfs.cpp | 3 ++- src/kernel/core/fs/pipefs.cpp | 5 +++-- src/kernel/core/fs/rootfs.c | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/kernel/core/fs/bootfs.c b/src/kernel/core/fs/bootfs.c index 3a9d86d71b..52c7fed9ad 100755 --- a/src/kernel/core/fs/bootfs.c +++ b/src/kernel/core/fs/bootfs.c @@ -378,7 +378,8 @@ bootfs_create_vnode_tree(struct bootfs *fs, struct bootfs_vnode *root) static status_t -bootfs_mount(mount_id id, const char *device, void *args, fs_volume *_fs, vnode_id *root_vnid) +bootfs_mount(mount_id id, const char *device, uint32 flags, const char *args, + fs_volume *_fs, vnode_id *root_vnid) { struct bootfs *fs; struct bootfs_vnode *v; diff --git a/src/kernel/core/fs/devfs.cpp b/src/kernel/core/fs/devfs.cpp index 6f835054e9..faccddd39d 100644 --- a/src/kernel/core/fs/devfs.cpp +++ b/src/kernel/core/fs/devfs.cpp @@ -660,7 +660,8 @@ get_device_name(struct devfs_vnode *vnode, char *buffer, size_t size) static status_t -devfs_mount(mount_id id, const char *devfs, void *args, fs_volume *_fs, vnode_id *root_vnid) +devfs_mount(mount_id id, const char *devfs, uint32 flags, const char *args, + fs_volume *_fs, vnode_id *root_vnid) { struct devfs *fs; struct devfs_vnode *v; diff --git a/src/kernel/core/fs/pipefs.cpp b/src/kernel/core/fs/pipefs.cpp index 10560f2af2..3da75d1936 100644 --- a/src/kernel/core/fs/pipefs.cpp +++ b/src/kernel/core/fs/pipefs.cpp @@ -26,7 +26,7 @@ // ToDo: handles file names suboptimally - it has all file names // in a singly linked list, no hash lookups or whatever. -#define TRACE_PIPEFS +//#define TRACE_PIPEFS #ifdef TRACE_PIPEFS # define TRACE(x) dprintf x #else @@ -858,7 +858,8 @@ ReadRequest::PutBuffer(const void **_buffer, size_t *_bytesLeft) static status_t -pipefs_mount(mount_id id, const char *device, void *args, fs_volume *_volume, vnode_id *_rootVnodeID) +pipefs_mount(mount_id id, const char *device, uint32 flags, const char *args, + fs_volume *_volume, vnode_id *_rootVnodeID) { TRACE(("pipefs_mount: entry\n")); diff --git a/src/kernel/core/fs/rootfs.c b/src/kernel/core/fs/rootfs.c index cee17b7c49..e70ce23af9 100755 --- a/src/kernel/core/fs/rootfs.c +++ b/src/kernel/core/fs/rootfs.c @@ -295,7 +295,8 @@ err: static status_t -rootfs_mount(mount_id id, const char *device, void *args, fs_volume *_fs, vnode_id *root_vnid) +rootfs_mount(mount_id id, const char *device, uint32 flags, const char *args, + fs_volume *_fs, vnode_id *root_vnid) { struct rootfs *fs; struct rootfs_vnode *vnode;