refresh (create temporary patch)

diff --git a/meta b/meta
index 33860432f052b05885082f833022b7ec2d29e644..0aa6b323dc164208cacaeaec6a664edc0d6d3228 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 1250945bdad5b28b8152a68d2e8c30bf10001f2d
-Head: c41b63504fb961b432e3a09b0e9c99480ddf6a1a
+Previous: 1948015c94c8cefffec22bbb5216e57e4d05d87a
+Head: fb94e8128c7be62baee6bce5123f1414dc067ce3
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: c41b63504fb961b432e3a09b0e9c99480ddf6a1a
+  refresh-temp: fb94e8128c7be62baee6bce5123f1414dc067ce3
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..1a0306a
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,30 @@
+Bottom: 89b109b9172f2fd26f7feaca314718e1127b4e64
+Top:    6fb26f02c06c27cb2b94fd21d21273260c3c4563
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-17 12:39:37 -0700
+
+Refresh of fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 1d76df9..cdf1ea6 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -391,7 +391,7 @@ int socket(int domain, int type, int protocol)
+       if (ret >= 0) {
+               if (fork_support) {
+                       rclose(ret);
+-                      ret = real_socket(domain, type, protocol);
++                      ret = real.socket(domain, type, protocol);
+                       if (ret < 0)
+                               return ret;
+                       fd_store(index, ret, fd_fork);
+@@ -863,6 +863,7 @@ pid_t fork(void)
+ 
+       param = 1;
+       rsetsockopt(dfd, IPPROTO_TCP, TCP_NODELAY, &param, sizeof param);
++      set_rsocket_options(dfd);
+ 
+       msg = 0;
+       ret = real.write(sfd, &msg, sizeof msg);