diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 14:53:08 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-06 01:47:43 +0200 |
| commit | 6aa12fcb30c8f7246fd0215b1d808191c0d87668 (patch) | |
| tree | 92eb805ea2ed03b1e42f6ce55ca26a65a92761fb /source3/modules/onefs_system.c | |
| parent | 48166468fe3ca515dae3431bbe674809489f743c (diff) | |
| download | samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.gz samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.bz2 samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.zip | |
build: Remove SMB_OFF_T, replace with off_t
Now that we always require a 64 bit off_t, we no longer need SMB_OFF_T.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Apr 6 01:47:43 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/modules/onefs_system.c')
| -rw-r--r-- | source3/modules/onefs_system.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c index 05b033181e..07272cc86b 100644 --- a/source3/modules/onefs_system.c +++ b/source3/modules/onefs_system.c @@ -230,7 +230,7 @@ int onefs_sys_create_file(connection_struct *conn, * FreeBSD based sendfile implementation that allows for atomic semantics. */ static ssize_t onefs_sys_do_sendfile(int tofd, int fromfd, - const DATA_BLOB *header, SMB_OFF_T offset, size_t count, bool atomic) + const DATA_BLOB *header, off_t offset, size_t count, bool atomic) { size_t total=0; struct sf_hdtr hdr; @@ -258,7 +258,7 @@ static ssize_t onefs_sys_do_sendfile(int tofd, int fromfd, total = count; while (total + hdtrl.iov_len) { - SMB_OFF_T nwritten; + off_t nwritten; int ret; /* @@ -330,7 +330,7 @@ static ssize_t onefs_sys_do_sendfile(int tofd, int fromfd, * Handles the subtleties of using sendfile with CIFS. */ ssize_t onefs_sys_sendfile(connection_struct *conn, int tofd, int fromfd, - const DATA_BLOB *header, SMB_OFF_T offset, + const DATA_BLOB *header, off_t offset, size_t count) { bool atomic = false; @@ -536,7 +536,7 @@ static char *get_spill_buffer(size_t new_count) * from the socket into the buffer, the spill buffer is then written with a * standard pwrite. */ -ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T offset, +ssize_t onefs_sys_recvfile(int fromfd, int tofd, off_t offset, size_t count) { char *spill_buffer = NULL; |