refresh

diff --git a/meta b/meta
index 47fe1527214d198b1fbce89842e2b115d32faa31..88ed57cc7437eb3c1cc58c45ec746fc1067693a9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 5523571ac7023b6d6090b532858c62ae0cf89de7
-Head: dec7d4ce09e292f7c0268b6464d9147f5ffa61b5
+Previous: b70f94dc730163021067a56ce108c93519f2335e
+Head: bd5281503e73a8110363c546e98b64a64a6d96dc
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fork-pass: 9d661d643b62858fe119794e0ca41b5575faa0ce
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
-  sendfile: 490b7dd0eb4396bca323b1d528a5eb0335a5384e
-  refresh-temp: dec7d4ce09e292f7c0268b6464d9147f5ffa61b5
+  sendfile: bd5281503e73a8110363c546e98b64a64a6d96dc
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   fstat: a62c653906870422edef5f6388dac9f76c953e35

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9857222..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: c63a3ced205684e4a942c6b067c0553eeea44538
-Top:    4268c51745c5dc86b489f28e7c8698b7a68db3a8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-14 12:23:51 -0700
-
-Refresh of sendfile
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index cbd731b..d3edd24 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -48,6 +48,7 @@
- #include <netinet/tcp.h>
- #include <unistd.h>
- #include <semaphore.h>
-+#include <sendfile.h>
- 
- #include <rdma/rdma_cma.h>
- #include <rdma/rdma_verbs.h>

diff --git a/patches/sendfile b/patches/sendfile
index 2a63e83490dd769a24b8f6e8c983a8b9daa1a2c1..215ce1b6d44004bc4b3b918dcd4761a322de31ae 100644 (file)
--- a/patches/sendfile
+++ b/patches/sendfile
@@ -1,5 +1,5 @@
 Bottom: 652ae6e1dadacc92be353adaafd434f1ff7ddbfa
-Top:    c63a3ced205684e4a942c6b067c0553eeea44538
+Top:    4268c51745c5dc86b489f28e7c8698b7a68db3a8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-13 17:00:42 -0700
 
@@ -13,10 +13,18 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 8b86415..cbd731b 100644
+index 8b86415..d3edd24 100644
 --- a/src/preload.c
 +++ b/src/preload.c
-@@ -84,6 +84,7 @@ struct socket_calls {
+@@ -48,6 +48,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 +85,7 @@ struct socket_calls {
                          void *optval, socklen_t *optlen);
        int (*fcntl)(int socket, int cmd, ... /* arg */);
        int (*dup2)(int oldfd, int newfd);
@@ -24,7 +32,7 @@ index 8b86415..cbd731b 100644
  };
  
  static struct socket_calls real;
-@@ -276,6 +277,7 @@ static void init_preload(void)
+@@ -276,6 +278,7 @@ static void init_preload(void)
        real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
        real.fcntl = dlsym(RTLD_NEXT, "fcntl");
        real.dup2 = dlsym(RTLD_NEXT, "dup2");
@@ -32,7 +40,7 @@ index 8b86415..cbd731b 100644
  
        rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
        rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -1009,3 +1011,23 @@ int dup2(int oldfd, int newfd)
+@@ -1009,3 +1012,23 @@ int dup2(int oldfd, int newfd)
        atomic_inc(&oldfdi->refcnt);
        return newfd;
  }