refresh

diff --git a/meta b/meta
index 5c72a1d7e018735bfc4df1ee649d28c026051889..96c9e8a85229094d11ccd6279b8cce6c6b3298dc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 02ea3052ae2a826e1973eab685a289c18532eca3
-Head: bc1ba36d26f13b1edb6797d458495a9436f9fde5
+Previous: 5b63aef5dcb5639b4850dffd59c0a7223c400cfa
+Head: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fork-pass: 9d661d643b62858fe119794e0ca41b5575faa0ce
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
-  sendfile: ff7e536bf5a42aef0eb51bc6f120b42842466e0f
-  refresh-temp: bc1ba36d26f13b1edb6797d458495a9436f9fde5
+  sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   fstat: a62c653906870422edef5f6388dac9f76c953e35

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ab9e8bb..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,42 +0,0 @@
-Bottom: 9baead7ab1e6af902e2683f1af27b76fb91f0ae2
-Top:    03b5e28f4ac8f642409cf46b6a2bfc0da609ec5d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-14 12:27:02 -0700
-
-Refresh of sendfile
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 9b71c77..c6cf176 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;
- }

diff --git a/patches/sendfile b/patches/sendfile
index 5c31952ae2381d3dc5e3edea17fb5a2e8a062bc3..6840bddcbd625aa79f4cc99b8005f131059e4a54 100644 (file)
--- a/patches/sendfile
+++ b/patches/sendfile
@@ -1,5 +1,5 @@
 Bottom: 652ae6e1dadacc92be353adaafd434f1ff7ddbfa
-Top:    9baead7ab1e6af902e2683f1af27b76fb91f0ae2
+Top:    03b5e28f4ac8f642409cf46b6a2bfc0da609ec5d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-13 17:00:42 -0700
 
@@ -13,25 +13,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 8b86415..9b71c77 100644
+index 8b86415..c6cf176 100644
 --- a/src/preload.c
 +++ b/src/preload.c
-@@ -38,6 +38,7 @@
+@@ -38,6 +38,8 @@
  #include <sys/types.h>
  #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>
-@@ -48,6 +49,7 @@
- #include <netinet/tcp.h>
- #include <unistd.h>
- #include <semaphore.h>
-+#include <sendfile.h>
- 
- #include <rdma/rdma_cma.h>
- #include <rdma/rdma_verbs.h>
 @@ -84,6 +86,7 @@ struct socket_calls {
                          void *optval, socklen_t *optlen);
        int (*fcntl)(int socket, int cmd, ... /* arg */);
@@ -66,9 +59,9 @@ index 8b86415..9b71c77 100644
 +      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;
 +}