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
This commit is contained in:
@@ -134,7 +134,7 @@ struct fs_vnode_ops {
|
|||||||
status_t (*set_flags)(fs_volume *volume, fs_vnode *vnode, void *cookie,
|
status_t (*set_flags)(fs_volume *volume, fs_vnode *vnode, void *cookie,
|
||||||
int flags);
|
int flags);
|
||||||
status_t (*select)(fs_volume *volume, fs_vnode *vnode, void *cookie,
|
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,
|
status_t (*deselect)(fs_volume *volume, fs_vnode *vnode, void *cookie,
|
||||||
uint8 event, selectsync *sync);
|
uint8 event, selectsync *sync);
|
||||||
status_t (*fsync)(fs_volume *volume, fs_vnode *vnode);
|
status_t (*fsync)(fs_volume *volume, fs_vnode *vnode);
|
||||||
|
|||||||
@@ -154,8 +154,7 @@ struct fssh_fs_vnode_ops {
|
|||||||
fssh_status_t (*set_flags)(fssh_fs_volume *volume, fssh_fs_vnode *vnode,
|
fssh_status_t (*set_flags)(fssh_fs_volume *volume, fssh_fs_vnode *vnode,
|
||||||
fssh_fs_cookie cookie, int flags);
|
fssh_fs_cookie cookie, int flags);
|
||||||
fssh_status_t (*select)(fssh_fs_volume *volume, fssh_fs_vnode *vnode,
|
fssh_status_t (*select)(fssh_fs_volume *volume, fssh_fs_vnode *vnode,
|
||||||
fssh_fs_cookie cookie, uint8_t event, uint32_t ref,
|
fssh_fs_cookie cookie, uint8_t event, fssh_selectsync *sync);
|
||||||
fssh_selectsync *sync);
|
|
||||||
fssh_status_t (*deselect)(fssh_fs_volume *volume, fssh_fs_vnode *vnode,
|
fssh_status_t (*deselect)(fssh_fs_volume *volume, fssh_fs_vnode *vnode,
|
||||||
fssh_fs_cookie cookie, uint8_t event, fssh_selectsync *sync);
|
fssh_fs_cookie cookie, uint8_t event, fssh_selectsync *sync);
|
||||||
fssh_status_t (*fsync)(fssh_fs_volume *volume, fssh_fs_vnode *vnode);
|
fssh_status_t (*fsync)(fssh_fs_volume *volume, fssh_fs_vnode *vnode);
|
||||||
|
|||||||
@@ -2304,7 +2304,7 @@ devfs_set_flags(fs_volume *_volume, fs_vnode *_vnode, void *_cookie,
|
|||||||
|
|
||||||
static status_t
|
static status_t
|
||||||
devfs_select(fs_volume *_volume, fs_vnode *_vnode, void *_cookie,
|
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_vnode *vnode = (struct devfs_vnode *)_vnode->private_node;
|
||||||
struct devfs_cookie *cookie = (struct devfs_cookie *)_cookie;
|
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)
|
if (!vnode->stream.u.dev.info->select)
|
||||||
return notify_select_event((selectsync*)sync, event);
|
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);
|
(selectsync*)sync);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -156,8 +156,7 @@ class Inode {
|
|||||||
int32 ReaderCount() const { return fReaderCount; }
|
int32 ReaderCount() const { return fReaderCount; }
|
||||||
int32 WriterCount() const { return fWriterCount; }
|
int32 WriterCount() const { return fWriterCount; }
|
||||||
|
|
||||||
status_t Select(uint8 event, uint32 ref, selectsync *sync,
|
status_t Select(uint8 event, selectsync *sync, int openMode);
|
||||||
int openMode);
|
|
||||||
status_t Deselect(uint8 event, selectsync *sync, int openMode);
|
status_t Deselect(uint8 event, selectsync *sync, int openMode);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -611,7 +610,7 @@ Inode::Close(int openMode)
|
|||||||
|
|
||||||
|
|
||||||
status_t
|
status_t
|
||||||
Inode::Select(uint8 event, uint32 ref, selectsync *sync, int openMode)
|
Inode::Select(uint8 event, selectsync *sync, int openMode)
|
||||||
{
|
{
|
||||||
bool writer = true;
|
bool writer = true;
|
||||||
select_sync_pool** pool;
|
select_sync_pool** pool;
|
||||||
@@ -901,7 +900,7 @@ fifo_set_flags(fs_volume *_volume, fs_vnode *_vnode, void *_cookie,
|
|||||||
|
|
||||||
static status_t
|
static status_t
|
||||||
fifo_select(fs_volume *_volume, fs_vnode *_node, void *_cookie,
|
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;
|
file_cookie *cookie = (file_cookie *)_cookie;
|
||||||
|
|
||||||
@@ -911,7 +910,7 @@ fifo_select(fs_volume *_volume, fs_vnode *_node, void *_cookie,
|
|||||||
return B_ERROR;
|
return B_ERROR;
|
||||||
|
|
||||||
BenaphoreLocker locker(inode->RequestLock());
|
BenaphoreLocker locker(inode->RequestLock());
|
||||||
return inode->Select(event, ref, sync, cookie->open_mode);
|
return inode->Select(event, sync, cookie->open_mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4828,7 +4828,7 @@ file_select(struct file_descriptor *descriptor, uint8 event,
|
|||||||
if (!HAS_FS_CALL(vnode, select))
|
if (!HAS_FS_CALL(vnode, select))
|
||||||
return notify_select_event(sync, event);
|
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user