Changeset 25268

Timestamp:

04/29/08 20:06:17 (7 months ago)

Author:

bonefish

Message:

Removed superfluous uint32 ref parameter from select() FS hook.

Location:

haiku/trunk

Files:

• headers/os/drivers/fs_interface.h (modified) (1 diff)
• headers/private/fs_shell/fssh_fs_interface.h (modified) (1 diff)
• src/system/kernel/fs/devfs.cpp (modified) (2 diffs)
• src/system/kernel/fs/fifo.cpp (modified) (4 diffs)
• src/system/kernel/fs/vfs.cpp (modified) (1 diff)

haiku/trunk/headers/os/drivers/fs_interface.h

@@ -135 +135 @@
                                 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);

haiku/trunk/headers/private/fs_shell/fssh_fs_interface.h

@@ -155 +155 @@
                                 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);

haiku/trunk/src/system/kernel/fs/devfs.cpp

@@ -2305 +2305 @@
 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;
@@ -2317 +2317 @@
                 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);
 }

haiku/trunk/src/system/kernel/fs/fifo.cpp

@@ -157 +157 @@
                 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);
 
@@ -612 +611 @@
 
 status_t
-Inode::Select(uint8 event, uint32 ref, selectsync *sync, int openMode)
+Inode::Select(uint8 event, selectsync *sync, int openMode)
 {
         bool writer = true;
@@ -902 +901 @@
 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;
@@ -912 +911 @@
 
         BenaphoreLocker locker(inode->RequestLock());
-        return inode->Select(event, ref, sync, cookie->open_mode);
+        return inode->Select(event, sync, cookie->open_mode);
 }
 

haiku/trunk/src/system/kernel/fs/vfs.cpp

@@ -4829 +4829 @@
                 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);
 }