From 1175b3cf67661f4c3e135178d1c41aeca6c7c20e Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 10 Feb 2015 12:25:35 -0800 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index 1368cec3..02079962 100644 --- a/meta +++ b/meta @@ -1,8 +1,9 @@ Version: 1 -Previous: 4d949a2f148e29624f6ee603d939140b34af54b2 -Head: 59c5dec8c5fd56285e82fd1b086b4a3a9874b349 +Previous: c3170ae2b727ffe5007a9ef7d73f801d051f19b9 +Head: b1e9117160ede8723c9e275ba84d90911b1b7126 Applied: raccept: 59c5dec8c5fd56285e82fd1b086b4a3a9874b349 + refresh-temp: b1e9117160ede8723c9e275ba84d90911b1b7126 Unapplied: old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..bbb84796 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,31 @@ +Bottom: cc9fe9e0f61b120af8e519dd3c5c3802a7170a6e +Top: 46d8983575845f36b314a540a1a90fb03a15cd1e +Author: Sean Hefty +Date: 2015-02-10 12:25:35 -0800 + +Refresh of raccept + +--- + +diff --git a/src/rsocket.c b/src/rsocket.c +index 1055728..84013f8 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -1242,12 +1242,14 @@ int raccept(int socket, struct sockaddr *addr, socklen_t *addrlen) + param.private_data = &cresp; + param.private_data_len = sizeof cresp; + ret = rdma_accept(new_rs->cm_id, ¶m); +- if (!ret) ++ if (!ret) { + new_rs->state = rs_connect_rdwr; +- else if (errno == EAGAIN || errno == EWOULDBLOCK) ++ } else if (errno == EAGAIN || errno == EWOULDBLOCK) { + new_rs->state = rs_accepting; +- else ++ return 1; ++ } else { + goto err; ++ } + + if (addr && addrlen) + rgetpeername(new_rs->index, addr, addrlen); -- 2.41.0