refresh

diff --git a/meta b/meta
index 48cc81dc010815bec47745272ec19fd384983a81..de68c29f2f9ada9b5b7570852a9d1da2a9c18a7e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 74ab2b251cc0e3de2deaa57a0c468a42dd1fb188
-Head: afed5c931ca5f4715ccafa075970676ce57fb7d4
+Previous: af92b43bd041c456637079578aef2ba876213c93
+Head: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
 Applied:
-  transpose: 8081f96f8481d898d8de86cbadac1ae459c93306
-  refresh-temp: afed5c931ca5f4715ccafa075970676ce57fb7d4
+  transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
 Unapplied:
   fork: a70ee35a8dfd07cca88c8b3b6fa6308bd0d3e3d0
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a44ff51..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 5fd229f7e20bde0c0ed3050847f79e5d4c8af2b1
-Top:    c0306f4628b14e75db3da212b4a99875f49be65f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-17 11:45:35 -0700
-
-Refresh of transpose
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 8f281d3..d2058e2 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -451,7 +451,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
-               }
- 
-               ret = transpose_socket(socket, fd_normal);
--              if (ret)
-+              if (ret < 0)
-                       return ret;
- 
-               rclose(fd);

diff --git a/patches/transpose b/patches/transpose
index d2f9e5cc724a92aabaf83e90fcd9d5c0d03e5ba7..532ea750f2f864d2fcc86dbd7888abea1c466efe 100644 (file)
--- a/patches/transpose
+++ b/patches/transpose
@@ -1,5 +1,5 @@
 Bottom: 7ec243f3149e9a1ff1d5183f18e30d2458e354d6
-Top:    5fd229f7e20bde0c0ed3050847f79e5d4c8af2b1
+Top:    c0306f4628b14e75db3da212b4a99875f49be65f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-16 14:17:58 -0700
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 2750b30..8f281d3 100644
+index 2750b30..d2058e2 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -53,38 +53,38 @@
@@ -320,8 +320,9 @@ index 2750b30..8f281d3 100644
                }
  
 -              ret = socket_fallback(socket, &fd);
+-              if (ret)
 +              ret = transpose_socket(socket, fd_normal);
-               if (ret)
++              if (ret < 0)
                        return ret;
 +
 +              rclose(fd);