From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 14 Aug 2012 19:27:02 +0000 (-0700)
Subject: Refresh of sendfile
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bc1ba36d26f13b1edb6797d458495a9436f9fde5;p=~shefty%2Flibrdmacm.git

Refresh of sendfile
---

diff --git a/src/preload.c b/src/preload.c
index 9b71c77e..c6cf1761 100644
--- a/src/preload.c
+++ b/src/preload.c
@@ -39,6 +39,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <sys/sendfile.h>
 #include <stdarg.h>
 #include <dlfcn.h>
 #include <netdb.h>
@@ -49,7 +50,6 @@
 #include <netinet/tcp.h>
 #include <unistd.h>
 #include <semaphore.h>
-#include <sendfile.h>
 
 #include <rdma/rdma_cma.h>
 #include <rdma/rdma_verbs.h>
@@ -1027,9 +1027,9 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
 	if (file_addr == (void *) -1)
 		return -1;
 
-	len = rsend(fd, file_addr, count);
-	if ((len > 0) && offset)
-		lseek(in_fd, len, SEEK_CUR);
+	ret = rwrite(fd, file_addr, count);
+	if ((ret > 0) && offset)
+		lseek(in_fd, ret, SEEK_CUR);
 	munmap(file_addr, count);
 	return ret;
 }