refresh (create temporary patch)

diff --git a/meta b/meta
index 2853ab4df78a5ebaec19168a6f30b723c3ab67ab..97dee8a64f9054f36d82508d625a2f556d59f5b6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 3d5fa13db348a09555efead70c177404f3af3ae3
-Head: ba64145774912b6bf96694108e36d1668ec0cbc4
+Previous: f266f37f7d713e09d52d2d4c969490b00229a33c
+Head: 3953f633c7a99a97b34b365c9530fdbf56db3d96
 Applied:
   acm: 8a0c0b32f75f1b439b5665e6047713ff6ef37ef9
   rs-fix: ba64145774912b6bf96694108e36d1668ec0cbc4
+  refresh-temp: 3953f633c7a99a97b34b365c9530fdbf56db3d96
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..bfdc49d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,34 @@
+Bottom: f1083d042db3658ee98dca601a0a2fd94d4cb12a
+Top:    3fd71bbdde8064c89162f5d4672b6b5bead9703a
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-20 09:12:46 -0700
+
+Refresh of rs-fix
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 8f19af5..474287e 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -520,7 +520,7 @@ static void fork_active(int socket)
+       if ((ret != sizeof msg) || msg)
+               goto err2;
+ 
+-      ret = rconnect(ret, (struct sockaddr *) &addr, len);
++      ret = rconnect(dfd, (struct sockaddr *) &addr, len);
+       if (ret)
+               goto err2;
+ 
+@@ -618,9 +618,9 @@ static inline enum fd_type fd_fork_get(int index, int *fd)
+ 
+       fdi = idm_lookup(&idm, index);
+       if (fdi) {
+-              if (fdi->type == fd_fork_passive)
++              if (fdi->state == fd_fork_passive)
+                       fork_passive(index);
+-              else if (fdi->type == fd_fork_active)
++              else if (fdi->state == fd_fork_active)
+                       fork_active(index);
+               *fd = fdi->fd;
+               return fdi->type;