s3:smbd: remove ancient DMF_FIX from read_file().
authorMichael Adam <obnox@samba.org>
Fri, 8 Jun 2012 12:23:09 +0000 (14:23 +0200)
committerMichael Adam <obnox@samba.org>
Fri, 8 Jun 2012 14:10:40 +0000 (16:10 +0200)
Pair-Programmed-With: Volker Lendecke <vl@samba.org>

source3/smbd/fileio.c

index ab505f4f8690c9736dabf73f494f02cbd532ac85..8fc73427071be965b0e687716d75982c3b839bea 100644 (file)
@@ -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;
                }