refresh

diff --git a/meta b/meta
index f42dc1333de9b3fe82acabdd8d2c447087998972..f15b312e7fb5a90d8c47ec3507676bf43f577ef3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 92b7330c6d6662711512d378db415bfb5bb170da
-Head: 6d5a0398f017540943247ab35fbceae0997118f3
+Previous: ef3c5f144ffdf1b268ad8a352ec9a387b3a473f5
+Head: ca5813e7cf95dee5933fc417e4a34d26f2b01824
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
-  dup2: 1df5d0ba001a0777074e6ab8ca215762b9431b53
-  refresh-temp: 6d5a0398f017540943247ab35fbceae0997118f3
+  dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
 Unapplied:
   fstat: b3146de2e39672cc98915604e2bc94dd98312356
   dbg-out: 332b5e4db811019600b165f03de1cd0326c94952

diff --git a/patches/dup2 b/patches/dup2
index 58db9690f594d7791106a7d3bb383e64bd70cdf3..32473033707b70841f67bf43957376bf48dbd816 100644 (file)
--- a/patches/dup2
+++ b/patches/dup2
@@ -1,5 +1,5 @@
 Bottom: c4f9e56fde30641b69e81060e3981b0df33f49c2
-Top:    fdd492cdb13406bafcf14c37b554b2de76a99d5b
+Top:    7cfa8b8bbb7449eac973ab817f043b3f1a3850b7
 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..085e8b4 100644
+index a680143..b18d310 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -83,6 +83,7 @@ struct socket_calls {
@@ -134,7 +134,7 @@ index a680143..085e8b4 100644
  }
  
  int getpeername(int socket, struct sockaddr *addr, socklen_t *addrlen)
-@@ -886,3 +912,51 @@ int fcntl(int socket, int cmd, ... /* arg */)
+@@ -886,3 +912,52 @@ int fcntl(int socket, int cmd, ... /* arg */)
        va_end(args);
        return ret;
  }
@@ -147,6 +147,7 @@ index a680143..085e8b4 100644
 +      struct fd_info *oldfdi, *newfdi;
 +      int ret;
 +
++      init_preload();
 +      oldfdi = idm_lookup(&idm, oldfd);
 +      if (oldfdi && oldfdi->type == fd_fork)
 +              fork_passive(oldfd);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e9d3129..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: fdd492cdb13406bafcf14c37b554b2de76a99d5b
-Top:    7cfa8b8bbb7449eac973ab817f043b3f1a3850b7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 13:53:54 -0700
-
-Refresh of dup2
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 085e8b4..b18d310 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -921,6 +921,7 @@ int dup2(int oldfd, int newfd)
-       struct fd_info *oldfdi, *newfdi;
-       int ret;
- 
-+      init_preload();
-       oldfdi = idm_lookup(&idm, oldfd);
-       if (oldfdi && oldfdi->type == fd_fork)
-               fork_passive(oldfd);