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/smbd/fileio.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/smbd/fileio.c')
| -rw-r--r-- | source3/smbd/fileio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index 85d879d8c5..8bdb66bcfe 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -25,13 +25,13 @@ #include "smbd/globals.h" #include "smbprofile.h" -static bool setup_write_cache(files_struct *, SMB_OFF_T); +static bool setup_write_cache(files_struct *, off_t); /**************************************************************************** Read from write cache if we can. ****************************************************************************/ -static bool read_from_write_cache(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n) +static bool read_from_write_cache(files_struct *fsp,char *data,off_t pos,size_t n) { write_cache *wcp = fsp->wcp; @@ -54,7 +54,7 @@ static bool read_from_write_cache(files_struct *fsp,char *data,SMB_OFF_T pos,siz Read from a file. ****************************************************************************/ -ssize_t read_file(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n) +ssize_t read_file(files_struct *fsp,char *data,off_t pos,size_t n) { ssize_t ret=0,readret; @@ -121,7 +121,7 @@ tryagain: static ssize_t real_write_file(struct smb_request *req, files_struct *fsp, const char *data, - SMB_OFF_T pos, + off_t pos, size_t n) { ssize_t ret; @@ -287,7 +287,7 @@ void trigger_write_time_update_immediate(struct files_struct *fsp) ssize_t write_file(struct smb_request *req, files_struct *fsp, const char *data, - SMB_OFF_T pos, + off_t pos, size_t n) { write_cache *wcp = fsp->wcp; @@ -905,7 +905,7 @@ void delete_write_cache(files_struct *fsp) Setup the write cache structure. ****************************************************************************/ -static bool setup_write_cache(files_struct *fsp, SMB_OFF_T file_size) +static bool setup_write_cache(files_struct *fsp, off_t file_size) { ssize_t alloc_size = lp_write_cache_size(SNUM(fsp->conn)); write_cache *wcp; @@ -950,7 +950,7 @@ static bool setup_write_cache(files_struct *fsp, SMB_OFF_T file_size) Cope with a size change. ****************************************************************************/ -void set_filelen_write_cache(files_struct *fsp, SMB_OFF_T file_size) +void set_filelen_write_cache(files_struct *fsp, off_t file_size) { if(fsp->wcp) { /* The cache *must* have been flushed before we do this. */ |