refresh

diff --git a/meta b/meta
index b39b485e42fb830048fb50f31423d0304bc41ee6..dde76338b3ce72cf4ce2c9e1f9ec9f7c44287495 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 98efd63b6a400dcbba47a8e735b7ed7d82c72e89
-Head: 7eac7053c6779e28b6c2e0dedf77aeb1260bda0f
+Previous: 30a1b56a5934bf9d19b9848cf71999ff01aea305
+Head: 54cd7a8f0be1f0af69828c837846f64661ca2c14
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -8,8 +8,7 @@ Applied:
   fork-pass: 9d661d643b62858fe119794e0ca41b5575faa0ce
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
-  fstat: 5f6035045a3c2dfa888ab2da865bcd16923a58a6
-  refresh-temp: 7eac7053c6779e28b6c2e0dedf77aeb1260bda0f
+  fstat: 54cd7a8f0be1f0af69828c837846f64661ca2c14
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/fstat b/patches/fstat
index 32581f32e262e7467a4c6377451ba5fc6077a71d..c84354a238077057ffbde848858098d35b3a31d6 100644 (file)
--- a/patches/fstat
+++ b/patches/fstat
@@ -1,5 +1,5 @@
 Bottom: 03b5e28f4ac8f642409cf46b6a2bfc0da609ec5d
-Top:    ebbfcee2d01231735d5a1be17b9fd52b51608bca
+Top:    758d450afd5a63013c7540fa171eea46bb810c1a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 09:37:24 -0700
 
@@ -13,34 +13,28 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index c6cf176..1dc7082 100644
+index c6cf176..ec62e69 100644
 --- a/src/preload.c
 +++ b/src/preload.c
-@@ -86,7 +86,11 @@ struct socket_calls {
-                         void *optval, socklen_t *optlen);
+@@ -87,6 +87,8 @@ struct socket_calls {
        int (*fcntl)(int socket, int cmd, ... /* arg */);
        int (*dup2)(int oldfd, int newfd);
-+<<<<<<< current
        ssize_t (*sendfile)(int out_fd, int in_fd, off_t *offset, size_t count);
-+=======
 +      int (*fxstat64)(int ver, int fd, struct stat64 *buf);
-+>>>>>>> patched
++      int (*fxstat)(int ver, int fd, struct stat *buf);
  };
  
  static struct socket_calls real;
-@@ -279,7 +283,11 @@ static void init_preload(void)
-       real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
+@@ -280,6 +282,8 @@ static void init_preload(void)
        real.fcntl = dlsym(RTLD_NEXT, "fcntl");
        real.dup2 = dlsym(RTLD_NEXT, "dup2");
-+<<<<<<< current
        real.sendfile = dlsym(RTLD_NEXT, "sendfile");
-+=======
 +      real.fxstat64 = dlsym(RTLD_NEXT, "__fxstat64");
-+>>>>>>> patched
++      real.fxstat = dlsym(RTLD_NEXT, "__fxstat");
  
        rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
        rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -1033,3 +1041,23 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
+@@ -1033,3 +1037,23 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
        munmap(file_addr, count);
        return ret;
  }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c97acab..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,39 +0,0 @@
-Bottom: ebbfcee2d01231735d5a1be17b9fd52b51608bca
-Top:    758d450afd5a63013c7540fa171eea46bb810c1a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-14 16:23:08 -0700
-
-Refresh of fstat
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 1dc7082..ec62e69 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -86,11 +86,9 @@ struct socket_calls {
-                         void *optval, socklen_t *optlen);
-       int (*fcntl)(int socket, int cmd, ... /* arg */);
-       int (*dup2)(int oldfd, int newfd);
--<<<<<<< current
-       ssize_t (*sendfile)(int out_fd, int in_fd, off_t *offset, size_t count);
--=======
-       int (*fxstat64)(int ver, int fd, struct stat64 *buf);
-->>>>>>> patched
-+      int (*fxstat)(int ver, int fd, struct stat *buf);
- };
- 
- static struct socket_calls real;
-@@ -283,11 +281,9 @@ static void init_preload(void)
-       real.getsockopt = dlsym(RTLD_NEXT, "getsockopt");
-       real.fcntl = dlsym(RTLD_NEXT, "fcntl");
-       real.dup2 = dlsym(RTLD_NEXT, "dup2");
--<<<<<<< current
-       real.sendfile = dlsym(RTLD_NEXT, "sendfile");
--=======
-       real.fxstat64 = dlsym(RTLD_NEXT, "__fxstat64");
-->>>>>>> patched
-+      real.fxstat = dlsym(RTLD_NEXT, "__fxstat");
- 
-       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
-       rs.bind = dlsym(RTLD_DEFAULT, "rbind");