From eb750d54589542d9e6d9d48ff3bed1890cee7050 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 8 Jun 2012 14:23:09 +0200 Subject: s3:smbd: remove ancient DMF_FIX from read_file(). Pair-Programmed-With: Volker Lendecke --- source3/smbd/fileio.c | 15 --------------- 1 file changed, 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; } -- cgit