summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h12
-rw-r--r--source3/include/proto.h14
-rw-r--r--source3/include/vfs.h32
-rw-r--r--source3/include/vfs_macros.h35
4 files changed, 0 insertions, 93 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index cfd4d9aa52..2a117cf227 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -334,18 +334,6 @@ struct stat_ex {
typedef struct stat_ex SMB_STRUCT_STAT;
-/*
- * Type for aiocb structure.
- */
-
-#ifndef SMB_STRUCT_AIOCB
-# if defined(HAVE_AIO)
-# define SMB_STRUCT_AIOCB struct aiocb
-# else
-# define SMB_STRUCT_AIOCB int /* AIO not being used but we still need the define.... */
-# endif
-#endif
-
enum timestamp_set_resolution {
TIMESTAMP_SET_SECONDS = 0,
TIMESTAMP_SET_MSEC,
diff --git a/source3/include/proto.h b/source3/include/proto.h
index d4be239120..f551c25590 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -310,20 +310,6 @@ uint32 unix_dev_minor(SMB_DEV_T dev);
#if 0
int sys_get_number_of_cores(void);
#endif
-int sys_aio_read(SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_write(SMB_STRUCT_AIOCB *aiocb);
-ssize_t sys_aio_return(SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_cancel(int fd, SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_error(const SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_fsync(int op, SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_suspend(const SMB_STRUCT_AIOCB * const cblist[], int n, const struct timespec *timeout);
-int sys_aio_read(SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_write(SMB_STRUCT_AIOCB *aiocb);
-ssize_t sys_aio_return(SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_cancel(int fd, SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_error(const SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_fsync(int op, SMB_STRUCT_AIOCB *aiocb);
-int sys_aio_suspend(const SMB_STRUCT_AIOCB * const cblist[], int n, const struct timespec *timeout);
struct stat;
void init_stat_ex_from_stat (struct stat_ex *dst,
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 1d9a2cd056..479376db37 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -451,12 +451,6 @@ enum vfs_fallocate_mode {
};
/*
- * forward declaration required here until the posix aio functions
- * leave the VFS
- */
-struct aiocb;
-
-/*
Available VFS operations. These values must be in sync with vfs_ops struct
(struct vfs_fn_pointers and struct vfs_handle_pointers inside of struct vfs_ops).
In particular, if new operations are added to vfs_ops, appropriate constants
@@ -709,13 +703,6 @@ struct vfs_fn_pointers {
int (*fsetxattr_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const char *name, const void *value, size_t size, int flags);
/* aio operations */
- int (*aio_read_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
- int (*aio_write_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
- ssize_t (*aio_return_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
- int (*aio_cancel_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
- int (*aio_error_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
- int (*aio_fsync_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, int op, SMB_STRUCT_AIOCB *aiocb);
- int (*aio_suspend_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp, const SMB_STRUCT_AIOCB * const aiocb[], int n, const struct timespec *timeout);
bool (*aio_force_fn)(struct vfs_handle_struct *handle, struct files_struct *fsp);
/* offline operations */
@@ -1147,25 +1134,6 @@ int smb_vfs_call_lsetxattr(struct vfs_handle_struct *handle, const char *path,
int smb_vfs_call_fsetxattr(struct vfs_handle_struct *handle,
struct files_struct *fsp, const char *name,
const void *value, size_t size, int flags);
-int smb_vfs_call_aio_read(struct vfs_handle_struct *handle,
- struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_write(struct vfs_handle_struct *handle,
- struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-ssize_t smb_vfs_call_aio_return(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_cancel(struct vfs_handle_struct *handle,
- struct files_struct *fsp, SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_error(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_fsync(struct vfs_handle_struct *handle,
- struct files_struct *fsp, int op,
- SMB_STRUCT_AIOCB *aiocb);
-int smb_vfs_call_aio_suspend(struct vfs_handle_struct *handle,
- struct files_struct *fsp,
- const SMB_STRUCT_AIOCB * const aiocb[], int n,
- const struct timespec *timeout);
bool smb_vfs_call_aio_force(struct vfs_handle_struct *handle,
struct files_struct *fsp);
bool smb_vfs_call_is_offline(struct vfs_handle_struct *handle,
diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 80b375e6e0..b88d112227 100644
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -573,41 +573,6 @@
#define SMB_VFS_NEXT_FSETXATTR(handle,fsp,name,value,size,flags) \
smb_vfs_call_fsetxattr((handle)->next,(fsp),(name),(value),(size),(flags))
-#define SMB_VFS_AIO_READ(fsp,aiocb) \
- smb_vfs_call_aio_read((fsp)->conn->vfs_handles, (fsp), (aiocb))
-#define SMB_VFS_NEXT_AIO_READ(handle,fsp,aiocb) \
- smb_vfs_call_aio_read((handle)->next,(fsp),(aiocb))
-
-#define SMB_VFS_AIO_WRITE(fsp,aiocb) \
- smb_vfs_call_aio_write((fsp)->conn->vfs_handles, (fsp), (aiocb))
-#define SMB_VFS_NEXT_AIO_WRITE(handle,fsp,aiocb) \
- smb_vfs_call_aio_write((handle)->next,(fsp),(aiocb))
-
-#define SMB_VFS_AIO_RETURN(fsp,aiocb) \
- smb_vfs_call_aio_return((fsp)->conn->vfs_handles, (fsp), (aiocb))
-#define SMB_VFS_NEXT_AIO_RETURN(handle,fsp,aiocb) \
- smb_vfs_call_aio_return((handle)->next,(fsp),(aiocb))
-
-#define SMB_VFS_AIO_CANCEL(fsp,aiocb) \
- smb_vfs_call_aio_cancel((fsp)->conn->vfs_handles, (fsp), (aiocb))
-#define SMB_VFS_NEXT_AIO_CANCEL(handle,fsp,aiocb) \
- smb_vfs_call_aio_cancel((handle)->next,(fsp),(aiocb))
-
-#define SMB_VFS_AIO_ERROR(fsp,aiocb) \
- smb_vfs_call_aio_error((fsp)->conn->vfs_handles, (fsp),(aiocb))
-#define SMB_VFS_NEXT_AIO_ERROR(handle,fsp,aiocb) \
- smb_vfs_call_aio_error((handle)->next,(fsp),(aiocb))
-
-#define SMB_VFS_AIO_FSYNC(fsp,op,aiocb) \
- smb_vfs_call_aio_fsync((fsp)->conn->vfs_handles, (fsp), (op),(aiocb))
-#define SMB_VFS_NEXT_AIO_FSYNC(handle,fsp,op,aiocb) \
- smb_vfs_call_aio_fsync((handle)->next,(fsp),(op),(aiocb))
-
-#define SMB_VFS_AIO_SUSPEND(fsp,aiocb,n,ts) \
- smb_vfs_call_aio_suspend((fsp)->conn->vfs_handles, (fsp),(aiocb),(n),(ts))
-#define SMB_VFS_NEXT_AIO_SUSPEND(handle,fsp,aiocb,n,ts) \
- smb_vfs_call_aio_suspend((handle)->next,(fsp),(aiocb),(n),(ts))
-
#define SMB_VFS_AIO_FORCE(fsp) \
smb_vfs_call_aio_force((fsp)->conn->vfs_handles, (fsp))
#define SMB_VFS_NEXT_AIO_FORCE(handle,fsp) \
generated by cgit (git 2.34.1) at 2024-11-24 23:56:30 +0000