refresh (create temporary patch)

diff --git a/meta b/meta
index 1396b8d7e058975acb69b1dec7c03314cb0b9bf4..f125152d7fb00a2a9e3d25be25590bc8f592f1ec 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 5912025254efa817ebe927bd80b9d3331ca99e4b
-Head: b2532c5a797fd47e2f6958bdfd5d3bea696ca0b6
+Previous: cf6edb53b093933528fa9e3492d2e7f404831305
+Head: 4c3f32c793047d22f9d9b5a9f25d7ef61eb015d7
 Applied:
   transpose: 4c834bc154a73e7edd6dd4a912933958ca142d8d
   fork: b2532c5a797fd47e2f6958bdfd5d3bea696ca0b6
+  refresh-temp: 4c3f32c793047d22f9d9b5a9f25d7ef61eb015d7
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..420df3a
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,29 @@
+Bottom: 1c8fbc5fdc8ac86358d7095d9ac4561f47eec4ea
+Top:    6824bd04c82761ee7e8d74496b6527b2166fd460
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-16 14:45:34 -0700
+
+Refresh of fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 177c621..9c4c423 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -431,12 +431,10 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
+       if (ret != sizeof msg)
+               return ret;
+ 
+-      rs = rsocket(domain, type, protocol);
+-
+-      real_shutdown(fd, SHUT_RDWR);
+-      real_close(fd);
+-
+-      fd_store(socket, fd, fd_rsocket);
++      ret = transpose_socket(socket, &fd, fd_rsocket, rsocket,
++                             real_close, rclose, real_getsockname,
++                             real_getsockopt, rsetsockopt,
++                             real_fcntl, rfcntl);
+       return connect(socket, addr, addrlen);
+ }