diff options
| author | Volker Lendecke <vl@samba.org> | 2009-07-23 20:28:58 -0400 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-07-24 11:42:05 -0400 |
| commit | 033185e2a1b2892fe8dc74a18a38e5e13e08cb22 (patch) | |
| tree | 67f652f7c4caba015eb3ad7b5ad7d0f6ed56cc8d /source3/modules/vfs_readahead.c | |
| parent | be5cf236968658263b0be5e1e4742741c70f65f8 (diff) | |
| download | samba-033185e2a1b2892fe8dc74a18a38e5e13e08cb22.tar.gz samba-033185e2a1b2892fe8dc74a18a38e5e13e08cb22.tar.bz2 samba-033185e2a1b2892fe8dc74a18a38e5e13e08cb22.zip | |
Make the smbd VFS typesafe
Diffstat (limited to 'source3/modules/vfs_readahead.c')
| -rw-r--r-- | source3/modules/vfs_readahead.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/source3/modules/vfs_readahead.c b/source3/modules/vfs_readahead.c index df75814b72..124230811d 100644 --- a/source3/modules/vfs_readahead.c +++ b/source3/modules/vfs_readahead.c @@ -155,18 +155,10 @@ static int readahead_connect(struct vfs_handle_struct *handle, return SMB_VFS_NEXT_CONNECT(handle, service, user); } -/******************************************************************* - Functions we're replacing. - We don't replace read as it isn't used from smbd to read file - data. -*******************************************************************/ - -static vfs_op_tuple readahead_ops [] = -{ - {SMB_VFS_OP(readahead_sendfile), SMB_VFS_OP_SENDFILE, SMB_VFS_LAYER_TRANSPARENT}, - {SMB_VFS_OP(readahead_pread), SMB_VFS_OP_PREAD, SMB_VFS_LAYER_TRANSPARENT}, - {SMB_VFS_OP(readahead_connect), SMB_VFS_OP_CONNECT, SMB_VFS_LAYER_TRANSPARENT}, - {SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP} +static struct vfs_fn_pointers vfs_readahead_fns = { + .sendfile = readahead_sendfile, + .pread = readahead_pread, + .connect_fn = readahead_connect }; /******************************************************************* @@ -176,5 +168,6 @@ static vfs_op_tuple readahead_ops [] = NTSTATUS vfs_readahead_init(void); NTSTATUS vfs_readahead_init(void) { - return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "readahead", readahead_ops); + return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "readahead", + &vfs_readahead_fns); } |