From b1a72a6432aabf370a651f364e231297a77b802e Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 28 May 2012 01:29:58 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/pre-socket | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/meta b/meta index 03d219ce..c407385b 100644 --- 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 6bd33392..111af8cb 100644 --- a/patches/pre-socket +++ b/patches/pre-socket @@ -1,5 +1,5 @@ -Bottom: ed5b3cf23ac01acbc57d249c7083577a19d344ce -Top: 87ab98f3bddaca811ce2dc2b7920287c23686a20 +Bottom: 7d082b248d215ee4c87c6a5c68d9aef9dbc46174 +Top: ffc4f684b77f0da6b71d94dd50cbfd77140892ec Author: Sean Hefty Date: 2012-05-25 12:42:12 -0700 @@ -31,10 +31,10 @@ Signed-off-by: Sean Hefty --- 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); -- 2.41.0