pop

diff --git a/meta b/meta
index d28fab1e6ffee992c45d730b6d40ae852bd0f196..8323bc829fb333e797930bbfdfce08e0574e166e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 9e733728929de1378a7da999569e2067dd110d64
-Head: cfbfe46cc8ed558bdf26be49ff0a055935012c7b
+Previous: 505cb78288398a4be3d5fc947063e0726c1b506a
+Head: 759e79f3ddc24bd32b323ccda6c0cc7eea60bbd4
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -12,8 +12,8 @@ Applied:
   rs-opts: 07f689f1d2f7a5fcea5ba5b69eaa221fc5e7f476
   rs-opt-qpsize: 85dc4bf0936707526ecb0a52f419d6246f741f4d
   rs-opt-inline: cfbfe46cc8ed558bdf26be49ff0a055935012c7b
+  pre-qpsize: 759e79f3ddc24bd32b323ccda6c0cc7eea60bbd4
 Unapplied:
-  pre-qpsize: 080d7cb887b6038fb4d4a4a4aedc609a5488ce62
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
   rs-states: 94e4650160dd8b32efd7e1befe3b179487bd7cac

diff --git a/patches/pre-qpsize b/patches/pre-qpsize
index 69b4e0c47bccd4834aac104a557364e138c29c6f..32fd0e972f09fbb406fa3f64b9f419cd1ea30375 100644 (file)
--- a/patches/pre-qpsize
+++ b/patches/pre-qpsize
@@ -1,5 +1,5 @@
-Bottom: 8741a1d852238e29ca2c917ec275c4bdc651f38f
-Top:    c042562c54c7fcb7925b0af4c00d669c58102958
+Bottom: 546fb8c731a40bcc37a8cd00b701dc5aea7b1f0d
+Top:    4b2610b05b4530b8bac8ed3c4f6cb13318ba63ae
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-21 18:46:36 -0700
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 87778eb..a3ef488 100644
+index 99afd26..d21389f 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -97,6 +97,10 @@ static int (*real_fcntl)(int socket, int cmd, ... /* arg */);
@@ -83,12 +83,12 @@ index 87778eb..a3ef488 100644
 +
  int socket(int domain, int type, int protocol)
  {
-       int index, ret;
-@@ -297,6 +335,7 @@ int socket(int domain, int type, int protocol)
-       ret = rsocket(domain, type, protocol);
+       static __thread int recursive;
+@@ -303,6 +341,7 @@ int socket(int domain, int type, int protocol)
+       recursive = 0;
        if (ret >= 0) {
                fd_store(index, ret, fd_rsocket);
 +              set_rsocket_options(ret);
                return index;
-       } else {
-               fd_close(index, &ret);
+       }
+       fd_close(index, &ret);