refresh

diff --git a/meta b/meta
index 59fbc73f29c3e4a6bfa431eece912a6e0d4cf0e4..f8362c518bba9213c5fc72155011775207d47b67 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 4ff173bd5ac93607e85ad17412c205220fee303d
-Head: 733fda191323e6228bdb1efba350f663e803324b
+Previous: 250694c565f9e3adaee354929660e7bda06c2907
+Head: 6a2efde034c2ac78ea8b5429361d95d75fc2731a
 Applied:
   rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 7856c0c353736cee5399eb2f706a6ac2913cc368
   fork: 1768d762d8a2100e5250234ddf080b722a5e582f
   rstream-fork: 2724e02d5b461f8c580249461271de0f7acefcab
-  fork-xfer: 5d3b93c68e98b8d321c63a44af06d052e552a0f6
-  refresh-temp: 733fda191323e6228bdb1efba350f663e803324b
+  fork-xfer: 6a2efde034c2ac78ea8b5429361d95d75fc2731a
 Unapplied:
   dbg: 3ec7b3dd2db8422fd840e3cee062c629e7b8f5b6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/fork-xfer b/patches/fork-xfer
index 0ad30cf76b3c55ed0fda2eb2f227571adf6e2ee9..e40af626e70ab1da76da98cf131b9d2a7c06a3fb 100644 (file)
--- a/patches/fork-xfer
+++ b/patches/fork-xfer
@@ -1,5 +1,5 @@
 Bottom: e0b82367be775902f3588a79dd714486d21646b3
-Top:    701bfad47cfeefb22f51e3977fe3629945359257
+Top:    dd3e337c812c828bd16fb07d95a805d5eaaccc91
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-19 17:09:29 -0700
 
@@ -18,7 +18,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index f824af3..82a4125 100644
+index f824af3..79340c6 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -96,7 +96,6 @@ static int sq_size;
@@ -100,8 +100,8 @@ index f824af3..82a4125 100644
 +              goto lclose;
 +
 +      msg = 0;
-+      ret = real.write(sfd, &msg, sizeof msg);
-+      if (ret != sizeof msg)
++      len = real.write(sfd, &msg, sizeof msg);
++      if (len != sizeof msg)
 +              goto lclose;
 +
 +      dfd = raccept(lfd, NULL, NULL);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index de47062..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 701bfad47cfeefb22f51e3977fe3629945359257
-Top:    dd3e337c812c828bd16fb07d95a805d5eaaccc91
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-23 16:28:11 -0700
-
-Refresh of fork-xfer
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 82a4125..79340c6 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -536,8 +536,8 @@ static void fork_passive(int socket)
-               goto lclose;
- 
-       msg = 0;
--      ret = real.write(sfd, &msg, sizeof msg);
--      if (ret != sizeof msg)
-+      len = real.write(sfd, &msg, sizeof msg);
-+      if (len != sizeof msg)
-               goto lclose;
- 
-       dfd = raccept(lfd, NULL, NULL);