summaryrefslogtreecommitdiff
path: root/source3/smbd/fileio.c
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-06-08 14:23:09 +0200
committerMichael Adam <obnox@samba.org>2012-06-08 16:10:40 +0200
commiteb750d54589542d9e6d9d48ff3bed1890cee7050 (patch)
treef3e73f82a932ac1b412d23f0c8206285982702cb /source3/smbd/fileio.c
parent80d37023d10ac9cb7c71566933c5613631ce38b8 (diff)
downloadsamba-eb750d54589542d9e6d9d48ff3bed1890cee7050.tar.gz
samba-eb750d54589542d9e6d9d48ff3bed1890cee7050.tar.bz2
samba-eb750d54589542d9e6d9d48ff3bed1890cee7050.zip
s3:smbd: remove ancient DMF_FIX from read_file().
Pair-Programmed-With: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3/smbd/fileio.c')
-rw-r--r--source3/smbd/fileio.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index ab505f4f86..8fc7342707 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -87,27 +87,12 @@ ssize_t read_file(files_struct *fsp,char *data,off_t pos,size_t n)
fsp->fh->pos = pos;
if (n > 0) {
-#ifdef DMF_FIX
- int numretries = 3;
-tryagain:
readret = SMB_VFS_PREAD(fsp,data,n,pos);
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 = SMB_VFS_PREAD(fsp,data,n,pos);
- if (readret == -1) {
- return -1;
- }
-#endif
if (readret > 0) {
ret += readret;
}