From 24280972976f3e70bd4357b646a3647e1c4fa131 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 30 Apr 2008 00:06:17 +0000 Subject: [PATCH] Removed superfluous uint32 ref parameter from select() FS hook. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25268 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/drivers/fs_interface.h | 2 +- headers/private/fs_shell/fssh_fs_interface.h | 3 +-- src/system/kernel/fs/devfs.cpp | 4 ++-- src/system/kernel/fs/fifo.cpp | 9 ++++----- src/system/kernel/fs/vfs.cpp | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/headers/os/drivers/fs_interface.h b/headers/os/drivers/fs_interface.h index b5bf8cf6da..59be62ff73 100644 --- a/headers/os/drivers/fs_interface.h +++ b/headers/os/drivers/fs_interface.h @@ -134,7 +134,7 @@ struct fs_vnode_ops { status_t (*set_flags)(fs_volume *volume, fs_vnode *vnode, void *cookie, int flags); status_t (*select)(fs_volume *volume, fs_vnode *vnode, void *cookie, - uint8 event, uint32 ref, selectsync *sync); + uint8 event, selectsync *sync); status_t (*deselect)(fs_volume *volume, fs_vnode *vnode, void *cookie, uint8 event, selectsync *sync); status_t (*fsync)(fs_volume *volume, fs_vnode *vnode); diff --git a/headers/private/fs_shell/fssh_fs_interface.h b/headers/private/fs_shell/fssh_fs_interface.h index e396c2c965..c514bcdf06 100644 --- a/headers/private/fs_shell/fssh_fs_interface.h +++ b/headers/private/fs_shell/fssh_fs_interface.h @@ -154,8 +154,7 @@ struct fssh_fs_vnode_ops { fssh_status_t (*set_flags)(fssh_fs_volume *volume, fssh_fs_vnode *vnode, fssh_fs_cookie cookie, int flags); fssh_status_t (*select)(fssh_fs_volume *volume, fssh_fs_vnode *vnode, - fssh_fs_cookie cookie, uint8_t event, uint32_t ref, - fssh_selectsync *sync); + fssh_fs_cookie cookie, uint8_t event, fssh_selectsync *sync); fssh_status_t (*deselect)(fssh_fs_volume *volume, fssh_fs_vnode *vnode, fssh_fs_cookie cookie, uint8_t event, fssh_selectsync *sync); fssh_status_t (*fsync)(fssh_fs_volume *volume, fssh_fs_vnode *vnode); diff --git a/src/system/kernel/fs/devfs.cpp b/src/system/kernel/fs/devfs.cpp index dad71351e9..1e0d5790e0 100644 --- a/src/system/kernel/fs/devfs.cpp +++ b/src/system/kernel/fs/devfs.cpp @@ -2304,7 +2304,7 @@ devfs_set_flags(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, static status_t devfs_select(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, - uint8 event, uint32 ref, selectsync *sync) + uint8 event, selectsync *sync) { struct devfs_vnode *vnode = (struct devfs_vnode *)_vnode->private_node; struct devfs_cookie *cookie = (struct devfs_cookie *)_cookie; @@ -2316,7 +2316,7 @@ devfs_select(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, if (!vnode->stream.u.dev.info->select) return notify_select_event((selectsync*)sync, event); - return vnode->stream.u.dev.info->select(cookie->device_cookie, event, ref, + return vnode->stream.u.dev.info->select(cookie->device_cookie, event, 0, (selectsync*)sync); } diff --git a/src/system/kernel/fs/fifo.cpp b/src/system/kernel/fs/fifo.cpp index 77cae4ac4b..55c83e171c 100644 --- a/src/system/kernel/fs/fifo.cpp +++ b/src/system/kernel/fs/fifo.cpp @@ -156,8 +156,7 @@ class Inode { int32 ReaderCount() const { return fReaderCount; } int32 WriterCount() const { return fWriterCount; } - status_t Select(uint8 event, uint32 ref, selectsync *sync, - int openMode); + status_t Select(uint8 event, selectsync *sync, int openMode); status_t Deselect(uint8 event, selectsync *sync, int openMode); private: @@ -611,7 +610,7 @@ Inode::Close(int openMode) status_t -Inode::Select(uint8 event, uint32 ref, selectsync *sync, int openMode) +Inode::Select(uint8 event, selectsync *sync, int openMode) { bool writer = true; select_sync_pool** pool; @@ -901,7 +900,7 @@ fifo_set_flags(fs_volume *_volume, fs_vnode *_vnode, void *_cookie, static status_t fifo_select(fs_volume *_volume, fs_vnode *_node, void *_cookie, - uint8 event, uint32 ref, selectsync *sync) + uint8 event, selectsync *sync) { file_cookie *cookie = (file_cookie *)_cookie; @@ -911,7 +910,7 @@ fifo_select(fs_volume *_volume, fs_vnode *_node, void *_cookie, return B_ERROR; BenaphoreLocker locker(inode->RequestLock()); - return inode->Select(event, ref, sync, cookie->open_mode); + return inode->Select(event, sync, cookie->open_mode); } diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index 5080a81e54..d9b9784beb 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -4828,7 +4828,7 @@ file_select(struct file_descriptor *descriptor, uint8 event, if (!HAS_FS_CALL(vnode, select)) return notify_select_event(sync, event); - return FS_CALL(vnode, select, descriptor->cookie, event, 0, sync); + return FS_CALL(vnode, select, descriptor->cookie, event, sync); }