diff options
| author | Michael Adam <obnox@samba.org> | 2008-01-11 00:51:19 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-01-11 01:27:05 +0100 |
| commit | a52cfb7d777157c93c9dc26c67f457be592dd537 (patch) | |
| tree | 540f812067521936447e0304d7709e6b47c9c3d0 /source/include/vfs.h | |
| parent | 3936de735a7bb548df8ce7f06f2cc8f7ffdf56cd (diff) | |
| download | samba-a52cfb7d777157c93c9dc26c67f457be592dd537.tar.gz samba-a52cfb7d777157c93c9dc26c67f457be592dd537.tar.xz samba-a52cfb7d777157c93c9dc26c67f457be592dd537.zip | |
Combine fsp and fromfd to fromfsp in SMB_VFS_SENDFILE().
Michael
Diffstat (limited to 'source/include/vfs.h')
| -rw-r--r-- | source/include/vfs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/include/vfs.h b/source/include/vfs.h index 8aa8057982c..11f88c98f36 100644 --- a/source/include/vfs.h +++ b/source/include/vfs.h @@ -101,6 +101,7 @@ /* Leave at 22 - not yet released. Remove parameter fd from aio_cancel. - obnox */ /* Leave at 22 - not yet released. Remove parameter fd from read. - obnox */ /* Leave at 22 - not yet released. Remove parameter fd from write. - obnox */ +/* Leave at 22 - not yet released. Remove parameter fromfd from sendfile. - obnox */ @@ -297,7 +298,7 @@ struct vfs_ops { ssize_t (*write)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n); ssize_t (*pwrite)(struct vfs_handle_struct *handle, struct files_struct *fsp, const void *data, size_t n, SMB_OFF_T offset); SMB_OFF_T (*lseek)(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_OFF_T offset, int whence); - ssize_t (*sendfile)(struct vfs_handle_struct *handle, int tofd, files_struct *fsp, int fromfd, const DATA_BLOB *header, SMB_OFF_T offset, size_t count); + ssize_t (*sendfile)(struct vfs_handle_struct *handle, int tofd, files_struct *fromfsp, const DATA_BLOB *header, SMB_OFF_T offset, size_t count); ssize_t (*recvfile)(struct vfs_handle_struct *handle, int fromfd, files_struct *fsp, int tofd, SMB_OFF_T offset, size_t count); int (*rename)(struct vfs_handle_struct *handle, const char *oldname, const char *newname); int (*fsync)(struct vfs_handle_struct *handle, struct files_struct *fsp); |