refresh

diff --git a/meta b/meta
index 4541d8c08aabca123c110dc5f8230534929f93be..48b2ddb360141800f520740bf7c33013a4b96419 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 1cc466d55675f2efb5745cb1debff41c419f897b
-Head: 38d95aae2cd736b7194f1ab1fe663c3b06827627
+Previous: 8a5b357b0f9e068fee74b9fa99ea51e44276c4b8
+Head: 5f6035045a3c2dfa888ab2da865bcd16923a58a6
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -8,8 +8,7 @@ Applied:
   fork-pass: 9d661d643b62858fe119794e0ca41b5575faa0ce
   fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
-  fstat: e5e956b7a4f61e3dbd8f1137877031040cc525ac
-  refresh-temp: 38d95aae2cd736b7194f1ab1fe663c3b06827627
+  fstat: 5f6035045a3c2dfa888ab2da865bcd16923a58a6
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/fstat b/patches/fstat
index edabf37835f42a60360245b24284fc7cd78fcdf0..32581f32e262e7467a4c6377451ba5fc6077a71d 100644 (file)
--- a/patches/fstat
+++ b/patches/fstat
@@ -1,5 +1,5 @@
 Bottom: 03b5e28f4ac8f642409cf46b6a2bfc0da609ec5d
-Top:    3bb516909d69e30fc529f1702bc96db012fce103
+Top:    ebbfcee2d01231735d5a1be17b9fd52b51608bca
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 09:37:24 -0700
 
@@ -13,7 +13,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index c6cf176..f0c4174 100644
+index c6cf176..1dc7082 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -86,7 +86,11 @@ struct socket_calls {
@@ -40,21 +40,27 @@ index c6cf176..f0c4174 100644
  
        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)
+@@ -1033,3 +1041,23 @@ 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;
++//    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;
++//    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;
++      return real.fxstat64(ver, socket, buf);
++}
++
++int __fxstat(int ver, int socket, struct stat *buf)
++{
++      return real.fxstat(ver, socket, buf);
 +}

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b917304..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,43 +0,0 @@
-Bottom: 3bb516909d69e30fc529f1702bc96db012fce103
-Top:    ebbfcee2d01231735d5a1be17b9fd52b51608bca
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-14 16:21:52 -0700
-
-Refresh of fstat
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index f0c4174..1dc7082 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -1044,14 +1044,20 @@ ssize_t sendfile(int out_fd, int in_fd, off_t *offset, size_t count)
- 
- int __fxstat64(int ver, int socket, struct stat64 *buf)
- {
--      int fd, ret;
-+//    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;
-+      return real.fxstat64(ver, socket, buf);
-+}
- 
--      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;
-+int __fxstat(int ver, int socket, struct stat *buf)
-+{
-+      return real.fxstat(ver, socket, buf);
- }