pop

diff --git a/meta b/meta
index 03d219ce2db8ff39854c35c8be811708e8f381df..c407385bc49a3d4cd0bb38ce9d22c22cd6e02bd9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,13 @@
 Version: 1
-Previous: e1ea33fb13f3306e4c91601cc1f3021f1f51b437
-Head: 272c3cc024d0e5854cbafa6c2f1e8560398a68d7
+Previous: c9e065ebdc3fb4b7a95617c0e7627191e6b06619
+Head: 674e710e8ddca56a05d8c3611a36ba2613ff1cff
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
   rs-recv-hang: 9fe16d42109fffc021dce5a12e072815d7487b96
   acm-sock: 01c3d7c91ac260f51823999eeb998dcb5c4a20c7
   acm-init: 272c3cc024d0e5854cbafa6c2f1e8560398a68d7
+  pre-socket: 674e710e8ddca56a05d8c3611a36ba2613ff1cff
 Unapplied:
   rs-qpsize: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
   rs-opts: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
@@ -15,7 +16,6 @@ Unapplied:
   pre-qpsize: 080d7cb887b6038fb4d4a4a4aedc609a5488ce62
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
-  pre-socket: 659f605c2d6bdba067651138aa5ffc01f14465d6
   rs-states: 94e4650160dd8b32efd7e1befe3b179487bd7cac
   rstream-opt: dd89287ce678fa211e3f427497f42e447c48b56d
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511

diff --git a/patches/pre-socket b/patches/pre-socket
index 6bd33392c090db91b33d476e625169c1804f5d3f..111af8cb44179e54f8fb45778187d57f92d423c1 100644 (file)
--- a/patches/pre-socket
+++ b/patches/pre-socket
@@ -1,5 +1,5 @@
-Bottom: ed5b3cf23ac01acbc57d249c7083577a19d344ce
-Top:    87ab98f3bddaca811ce2dc2b7920287c23686a20
+Bottom: 7d082b248d215ee4c87c6a5c68d9aef9dbc46174
+Top:    ffc4f684b77f0da6b71d94dd50cbfd77140892ec
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 12:42:12 -0700
 
@@ -31,10 +31,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index a3ef488..d21389f 100644
+index 87778eb..99afd26 100644
 --- a/src/preload.c
 +++ b/src/preload.c
-@@ -325,22 +325,28 @@ void set_rsocket_options(int rsocket)
+@@ -287,21 +287,27 @@ err:
  
  int socket(int domain, int type, int protocol)
  {
@@ -54,7 +54,6 @@ index a3ef488..d21389f 100644
 +      recursive = 0;
        if (ret >= 0) {
                fd_store(index, ret, fd_rsocket);
-               set_rsocket_options(ret);
                return index;
 -      } else {
 -              fd_close(index, &ret);