refresh (create temporary patch)

diff --git a/meta b/meta
index 831c4b3dbf2e7e47cdd55f69684a51443398143e..54dcfbe3589a79def5d2186d408b00ea4b40df86 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: 853536fe56092678f43e8004889f171b8b97257a
-Head: 9f41de8f49824b574067c97a6cd00b13f3e11e16
+Previous: 71677c45950b7758aad61929c199824b32e7d923
+Head: 264d1be51bf9494b9ca35820f9fc7b925a693418
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fork-connect: 9f41de8f49824b574067c97a6cd00b13f3e11e16
+  refresh-temp: 264d1be51bf9494b9ca35820f9fc7b925a693418
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   fstat: a62c653906870422edef5f6388dac9f76c953e35

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..d02888b
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,32 @@
+Bottom: e5851de376df609d0644456f8a89570a86a723f0
+Top:    0841906224bb250847983ffd2a5d0bee11b39b28
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-13 14:43:53 -0700
+
+Refresh of fork-connect
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 2830f14..33f3baf 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -609,7 +609,7 @@ static inline enum fd_type fd_fork_get(int index, int *fd)
+               if (fdi->type == fd_fork_passive)
+                       fork_passive(index);
+               else if (fdi->type == fd_fork_active)
+-                      fork_active(index, NULL, 0);
++                      fork_active(index);
+               *fd = fdi->fd;
+               return fdi->type;
+ 
+@@ -636,10 +636,6 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+               rclose(fd);
+               fd = ret;
+       } else if (fd_gets(socket) == fd_fork) {
+-//            flags = real.fcntl(fd, F_GETFL);
+-//            if (!(flags & O_NONBLOCK))
+-//                    return fork_active(socket, addr, addrlen);
+-//
+               fd_store(socket, fd, fd_normal, fd_fork_active);
+       }