refresh

diff --git a/meta b/meta
index 5211359345988a0247a065ca32ec29fd17e1d4d3..febbeab62ac7636fdf2d56f436ec75328ee0f455 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: e5a37f75222abc733aef07ec3d7afd365906ffdb
-Head: a83ed3dc5802a710f1815fb07f69e60f2a389b29
+Previous: 5ded699303e281c03d7655e093a5e47cc99aad65
+Head: 59482419509389d17feba6f6210abaec752eae80
 Applied:
   acm: 8a0c0b32f75f1b439b5665e6047713ff6ef37ef9
-  rs-fix: d46647ae56c4018c5c0eac0cc3d4202073aeae16
-  refresh-temp: a83ed3dc5802a710f1815fb07f69e60f2a389b29
+  rs-fix: 59482419509389d17feba6f6210abaec752eae80
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8d70413..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,41 +0,0 @@
-Bottom: 3fd71bbdde8064c89162f5d4672b6b5bead9703a
-Top:    30191aa638f3f574e67a71c82fa7771bcc620c52
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-20 12:20:40 -0700
-
-Refresh of rs-fix
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 474287e..0645f6d 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -504,6 +504,13 @@ static void fork_active(int socket)
- 
-       sfd = fd_getd(socket);
- 
-+      flags = real.fcntl(sfd, F_GETFL);
-+      real.fcntl(sfd, F_SETFL, 0);
-+      ret = real.recv(sfd, &msg, sizeof msg, MSG_PEEK);
-+      real.fcntl(sfd, F_SETFL, flags);
-+      if ((ret != sizeof msg) || msg)
-+              goto err1;
-+
-       len = sizeof addr;
-       ret = real.getpeername(sfd, (struct sockaddr *) &addr, &len);
-       if (ret)
-@@ -513,13 +520,6 @@ static void fork_active(int socket)
-       if (dfd < 0)
-               goto err1;
- 
--      flags = real.fcntl(sfd, F_GETFL);
--      real.fcntl(sfd, F_SETFL, 0);
--      ret = real.recv(sfd, &msg, sizeof msg, MSG_PEEK);
--      real.fcntl(sfd, F_SETFL, flags);
--      if ((ret != sizeof msg) || msg)
--              goto err2;
--
-       ret = rconnect(dfd, (struct sockaddr *) &addr, len);
-       if (ret)
-               goto err2;

diff --git a/patches/rs-fix b/patches/rs-fix
index cb591cc36e199e108cc227fe48b52b9bf6cce892..526cb2bd34d79d0fc94b5a018b0feb6f8aadac5e 100644 (file)
--- a/patches/rs-fix
+++ b/patches/rs-fix
@@ -1,5 +1,5 @@
 Bottom: f1083d042db3658ee98dca601a0a2fd94d4cb12a
-Top:    3fd71bbdde8064c89162f5d4672b6b5bead9703a
+Top:    30191aa638f3f574e67a71c82fa7771bcc620c52
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-20 09:06:49 -0700
 
@@ -11,13 +11,34 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 8f19af5..474287e 100644
+index 8f19af5..0645f6d 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;
+@@ -504,6 +504,13 @@ static void fork_active(int socket)
+ 
+       sfd = fd_getd(socket);
+ 
++      flags = real.fcntl(sfd, F_GETFL);
++      real.fcntl(sfd, F_SETFL, 0);
++      ret = real.recv(sfd, &msg, sizeof msg, MSG_PEEK);
++      real.fcntl(sfd, F_SETFL, flags);
++      if ((ret != sizeof msg) || msg)
++              goto err1;
++
+       len = sizeof addr;
+       ret = real.getpeername(sfd, (struct sockaddr *) &addr, &len);
+       if (ret)
+@@ -513,14 +520,7 @@ static void fork_active(int socket)
+       if (dfd < 0)
+               goto err1;
  
+-      flags = real.fcntl(sfd, F_GETFL);
+-      real.fcntl(sfd, F_SETFL, 0);
+-      ret = real.recv(sfd, &msg, sizeof msg, MSG_PEEK);
+-      real.fcntl(sfd, F_SETFL, flags);
+-      if ((ret != sizeof msg) || msg)
+-              goto err2;
+-
 -      ret = rconnect(ret, (struct sockaddr *) &addr, len);
 +      ret = rconnect(dfd, (struct sockaddr *) &addr, len);
        if (ret)