refresh

diff --git a/meta b/meta
index 316a9f8ece093b6dc001485e53bb26ba91f96798..ced3d65c0dbd32d2d055db814321222af450b4ec 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: b554b2d352dd31ea145e3a933190e6869a3ba842
-Head: d7493ce3599826209cb1edbfb348bd0fd27dda51
+Previous: be0508ff7660b82c8ef21f5a2d72006e014a3fa3
+Head: 1df5d0ba001a0777074e6ab8ca215762b9431b53
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
-  dup2: 61a01b6a5203227c9baaa9dd4d749eb06d09b48e
-  refresh-temp: d7493ce3599826209cb1edbfb348bd0fd27dda51
+  dup2: 1df5d0ba001a0777074e6ab8ca215762b9431b53
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dup2 b/patches/dup2
index a6ec5a88b6cb246753b55ecdd9e7e198a37af200..58db9690f594d7791106a7d3bb383e64bd70cdf3 100644 (file)
--- a/patches/dup2
+++ b/patches/dup2
@@ -1,5 +1,5 @@
 Bottom: c4f9e56fde30641b69e81060e3981b0df33f49c2
-Top:    7ab13a709c32c18a6a63e3cfe6aa048dca0c2c2a
+Top:    fdd492cdb13406bafcf14c37b554b2de76a99d5b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-30 16:06:32 -0700
 
@@ -65,7 +65,7 @@ index cedc0c3..6c3df27 100644
  int ucma_max_qpsize(struct rdma_cm_id *id);
  int ucma_complete(struct rdma_cm_id *id);
 diff --git a/src/preload.c b/src/preload.c
-index a680143..b3cf6ac 100644
+index a680143..085e8b4 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -83,6 +83,7 @@ struct socket_calls {
@@ -134,7 +134,7 @@ index a680143..b3cf6ac 100644
  }
  
  int getpeername(int socket, struct sockaddr *addr, socklen_t *addrlen)
-@@ -886,3 +912,48 @@ int fcntl(int socket, int cmd, ... /* arg */)
+@@ -886,3 +912,51 @@ int fcntl(int socket, int cmd, ... /* arg */)
        va_end(args);
        return ret;
  }
@@ -148,6 +148,9 @@ index a680143..b3cf6ac 100644
 +      int ret;
 +
 +      oldfdi = idm_lookup(&idm, oldfd);
++      if (oldfdi && oldfdi->type == fd_fork)
++              fork_passive(oldfd);
++
 +      newfdi = idm_lookup(&idm, newfd);
 +      if (newfdi) {
 +               /* newfd cannot have been dup'ed directly */

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 6580829..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 7ab13a709c32c18a6a63e3cfe6aa048dca0c2c2a
-Top:    fdd492cdb13406bafcf14c37b554b2de76a99d5b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-06 16:38:03 -0700
-
-Refresh of dup2
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index b3cf6ac..085e8b4 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -922,6 +922,9 @@ int dup2(int oldfd, int newfd)
-       int ret;
- 
-       oldfdi = idm_lookup(&idm, oldfd);
-+      if (oldfdi && oldfdi->type == fd_fork)
-+              fork_passive(oldfd);
-+
-       newfdi = idm_lookup(&idm, newfd);
-       if (newfdi) {
-                /* newfd cannot have been dup'ed directly */