refresh

diff --git a/meta b/meta
index 591557d9974ecd2d9494d4871a9b959afd4253d5..809c36855d792657fadff406b23b273fdfc1f160 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: d4100a151d1d7542204c48fde0c1f16e7ff4bc03
-Head: cc104131d3772a84bd4f0e59d7b6abb62ea0be01
+Previous: bb0cd9510e73f70e38bf05c45dc64e8efdcdb40a
+Head: e5e956b7a4f61e3dbd8f1137877031040cc525ac
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -8,8 +8,7 @@ Applied:
   fork-pass: 9d661d643b62858fe119794e0ca41b5575faa0ce
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
-  fstat: ab2929d76ed7d07fefa17c73a3ee291dab51db5e
-  refresh-temp: cc104131d3772a84bd4f0e59d7b6abb62ea0be01
+  fstat: e5e956b7a4f61e3dbd8f1137877031040cc525ac
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/fstat b/patches/fstat
index 9e5aafa182f83e70a048cde0c59559c3c8d2ca82..edabf37835f42a60360245b24284fc7cd78fcdf0 100644 (file)
--- a/patches/fstat
+++ b/patches/fstat
@@ -1,5 +1,5 @@
 Bottom: 03b5e28f4ac8f642409cf46b6a2bfc0da609ec5d
-Top:    03b5e28f4ac8f642409cf46b6a2bfc0da609ec5d
+Top:    3bb516909d69e30fc529f1702bc96db012fce103
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 09:37:24 -0700
 
@@ -12,4 +12,49 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index c6cf176..f0c4174 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -86,7 +86,11 @@ 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
+ };
+ 
+ static struct socket_calls real;
+@@ -279,7 +283,11 @@ 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
+ 
+       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
+       rs.bind = dlsym(RTLD_DEFAULT, "rbind");
+@@ -1033,3 +1041,17 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
+       munmap(file_addr, count);
+       return ret;
+ }
++
++int __fxstat64(int ver, int socket, struct stat64 *buf)
++{
++      int fd, ret;
++
++      if (fd_get(socket, &fd) == fd_rsocket) {
++              ret = real.fxstat64(ver, socket, buf);
++              if (!ret)
++                      buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
++      } else {
++              ret = real.fxstat64(ver, fd, buf);
++      }
++      return ret;
++}

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a9343cd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,55 +0,0 @@
-Bottom: 03b5e28f4ac8f642409cf46b6a2bfc0da609ec5d
-Top:    3bb516909d69e30fc529f1702bc96db012fce103
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-14 15:54:19 -0700
-
-Refresh of fstat
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index c6cf176..f0c4174 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -86,7 +86,11 @@ 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
- };
- 
- static struct socket_calls real;
-@@ -279,7 +283,11 @@ 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
- 
-       rs.socket = dlsym(RTLD_DEFAULT, "rsocket");
-       rs.bind = dlsym(RTLD_DEFAULT, "rbind");
-@@ -1033,3 +1041,17 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
-       munmap(file_addr, count);
-       return ret;
- }
-+
-+int __fxstat64(int ver, int socket, struct stat64 *buf)
-+{
-+      int fd, ret;
-+
-+      if (fd_get(socket, &fd) == fd_rsocket) {
-+              ret = real.fxstat64(ver, socket, buf);
-+              if (!ret)
-+                      buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
-+      } else {
-+              ret = real.fxstat64(ver, fd, buf);
-+      }
-+      return ret;
-+}