refresh

diff --git a/meta b/meta
index b0a0cc573b60394ebc18a71393e4c8bd968b21b2..6eb3991f1a2962878d53810de1245e24a1623d82 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 2e46867696082bfc98d51928a318e40bdd30563f
-Head: 7f16adcaf72b76f22cfe568c6484412f50099f28
+Previous: 0d9bd64e89fd5c77ea22f01276db4f1f045884be
+Head: 9c4d11465dc8b7950e956015e58bebaedb6e6def
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
-  fork: 49754c7df5f31b1de88c34a878b44131a4d5434c
-  refresh-temp: 7f16adcaf72b76f22cfe568c6484412f50099f28
+  fork: 9c4d11465dc8b7950e956015e58bebaedb6e6def
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/fork b/patches/fork
index cfcf93d3cbc2de58a9a46c8cf17dd68430fbf82f..9bdef8f15338cf9bb5400f6f9358bdfb5bb4b383 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: c0306f4628b14e75db3da212b4a99875f49be65f
-Top:    14944660e78363c6bab4cdc351003fe0f8f71bf4
+Top:    079d7bbe6129342c62546a42ccf45af677b9160f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index d2058e2..ed952d7 100644
+index d2058e2..6cc0d72 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@
@@ -181,14 +181,14 @@ index d2058e2..ed952d7 100644
 +      ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
 +      if (ret)
 +              goto out;
-+      sin6.sin6_flowinfor = sin6.sin6_scope_id = 0;
++      sin6.sin6_flowinfo = sin6.sin6_scope_id = 0;
 +      memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
 +
 +      sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
 +      if (sem == SEM_FAILED)
 +              goto out;
 +
-+      lfd = rsocket(sa.ss_family, SOCK_STREAM, 0);
++      lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
 +      if (lfd < 0)
 +              goto sclose;
 +

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index fcf0bcb..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 14944660e78363c6bab4cdc351003fe0f8f71bf4
-Top:    079d7bbe6129342c62546a42ccf45af677b9160f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-17 12:46:35 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index ed952d7..6cc0d72 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -836,14 +836,14 @@ pid_t fork(void)
-       ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
-       if (ret)
-               goto out;
--      sin6.sin6_flowinfor = sin6.sin6_scope_id = 0;
-+      sin6.sin6_flowinfo = sin6.sin6_scope_id = 0;
-       memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
- 
-       sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
-       if (sem == SEM_FAILED)
-               goto out;
- 
--      lfd = rsocket(sa.ss_family, SOCK_STREAM, 0);
-+      lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
-       if (lfd < 0)
-               goto sclose;