sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

#ifdefed DMF fix so not compiled by default. We need to look at this...

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent 4aca67761f
commit 97dca242a9
1 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
source/smbd/fileio.c
View File

@ -91,34 +91,51 @@ read from a file
ssize_t read_file(files_struct *fsp,char *data,SMB_OFF_T pos,size_t n)
{
ssize_t ret=0,readret;
ssize_t ret=0,readret;
/* you can't read from print files */
if (fsp->print_file) {
return -1;
}
/* you can't read from print files */
if (fsp->print_file)
return -1;
/*
* Serve from write cache if we can.
*/
if(read_from_write_cache(fsp, data, pos, n))
return n;
/*
* Serve from write cache if we can.
*/
flush_write_cache(fsp, READ_FLUSH);
if(read_from_write_cache(fsp, data, pos, n))
return n;
if (seek_file(fsp,pos) == -1) {
DEBUG(3,("read_file: Failed to seek to %.0f\n",(double)pos));
return(ret);
}
flush_write_cache(fsp, READ_FLUSH);
if (seek_file(fsp,pos) == -1) {
DEBUG(3,("read_file: Failed to seek to %.0f\n",(double)pos));
return(ret);
}
if (n > 0) {
readret = fsp->conn->vfs_ops.read(fsp,fsp->fd,data,n);
if (readret == -1)
return -1;
if (readret > 0) ret += readret;
}
if (n > 0) {
#ifdef DMF_FIX
int numretries = 3;
tryagain:
readret = fsp->conn->vfs_ops.read(fsp,fsp->fd,data,n);
if (readret == -1) {
if ((errno == EAGAIN) && numretries) {
DEBUG(3,("read_file EAGAIN retry in 10 seconds\n"));
(void)sleep(10);
--numretries;
goto tryagain;
}
return -1;
}
#else /* NO DMF fix. */
readret = fsp->conn->vfs_ops.read(fsp,fsp->fd,data,n);
if (readret == -1)
return -1;
#endif
return(ret);
if (readret > 0)
ret += readret;
}
return(ret);
}
/* how many write cache buffers have been allocated */