From: Michael Adam <obnox@samba.org>
Date: Fri, 8 Jun 2012 12:23:09 +0000 (+0200)
Subject: s3:smbd: remove ancient DMF_FIX from read_file().
X-Git-Tag: tevent-0.9.16~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb750d54589542d9e6d9d48ff3bed1890cee7050;p=thirdparty%2Fsamba.git

s3:smbd: remove ancient DMF_FIX from read_file().

Pair-Programmed-With: Volker Lendecke <vl@samba.org>
---

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index ab505f4f869..8fc73427071 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;
 		}