refresh

diff --git a/meta b/meta
index 313f605050bea49866af98504a3ca3e0c4f78ae7..d2a7f8b95d61daf1dc21876b4f8783b6370645b5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 21b589aad2f0dd7d8a61f3557eecf28deac94a52
-Head: 089ce56b00315152514ce12d53465603d3dd2b42
+Previous: 8af59cf32202848ae9ca27863046171f5c2e8657
+Head: cf6c4a3503761d2505c4f3782e0b3529347c1f17
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
-  fork: c3882ddaea14673b5b3b3322459209c02f4083bf
-  refresh-temp: 089ce56b00315152514ce12d53465603d3dd2b42
+  fork: cf6c4a3503761d2505c4f3782e0b3529347c1f17
 Unapplied:
   rstream-fork: ecd866920791883b70e9ed0f963bda63336664bc
   dbg: da928dc34f7529cc9ab73fc325d566d4152e4437

diff --git a/patches/fork b/patches/fork
index 470d4076a6ef451ee0239f9b79446b4deca41406..776ef7aa0dcc45feddee3fe08295907c394042a3 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
 Bottom: c0306f4628b14e75db3da212b4a99875f49be65f
-Top:    7877a1a5ec8b625a7127ef30ba236e4677df5df2
+Top:    c3cf2f5759614f2ebce8277cf3fac4f7c1643d05
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index d2058e2..a1073d5 100644
+index d2058e2..5b6b50a 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -46,6 +46,8 @@
@@ -128,8 +128,8 @@ index d2058e2..a1073d5 100644
 +      long flags;
 +
 +      fd = fd_getd(socket);
-+      flags = real.fcntl(fd, F_GETFD);
-+      real.fcntl(fd, F_SETFD, 0);
++      flags = real.fcntl(fd, F_GETFL);
++      real.fcntl(fd, F_SETFL, 0);
 +      ret = real.connect(fd, addr, addrlen);
 +      if (ret)
 +              return ret;
@@ -140,7 +140,7 @@ index d2058e2..a1073d5 100644
 +              return 0;
 +      }
 +
-+      real.fcntl(fd, F_SETFD, flags);
++      real.fcntl(fd, F_SETFL, flags);
 +      ret = transpose_socket(socket, fd_rsocket);
 +      if (ret < 0)
 +              return ret;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1b0f0c3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: 7877a1a5ec8b625a7127ef30ba236e4677df5df2
-Top:    c3cf2f5759614f2ebce8277cf3fac4f7c1643d05
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 11:42:39 -0700
-
-Refresh of fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index a1073d5..5b6b50a 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -468,8 +468,8 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
-       long flags;
- 
-       fd = fd_getd(socket);
--      flags = real.fcntl(fd, F_GETFD);
--      real.fcntl(fd, F_SETFD, 0);
-+      flags = real.fcntl(fd, F_GETFL);
-+      real.fcntl(fd, F_SETFL, 0);
-       ret = real.connect(fd, addr, addrlen);
-       if (ret)
-               return ret;
-@@ -480,7 +480,7 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
-               return 0;
-       }
- 
--      real.fcntl(fd, F_SETFD, flags);
-+      real.fcntl(fd, F_SETFL, flags);
-       ret = transpose_socket(socket, fd_rsocket);
-       if (ret < 0)
-               return ret;