From: Sean Hefty Date: Mon, 13 Aug 2012 21:47:35 +0000 (-0700) Subject: refresh X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a3fe2286dfde5d07c3eb482064b972884b7609e7;p=~shefty%2Flibrdmacm.git refresh --- diff --git a/meta b/meta index 60f712f2..e46530ec 100644 --- a/meta +++ b/meta @@ -1,12 +1,11 @@ Version: 1 -Previous: 083aaf02eb148dbd340e1b916fb8f97a5431c88d -Head: af2f529bdcc4ae2ec8db2948e6c31c8ce81d2a49 +Previous: 29114aa618aa141d8ac730244ecc1325d98338f5 +Head: b8fc073e29458b3df2dd57d4f3284a9392575479 Applied: real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2 dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824 oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97 - fork-connect: a31705e2a68851f684dc58edff0f08f3d3906cea - refresh-temp: af2f529bdcc4ae2ec8db2948e6c31c8ce81d2a49 + fork-connect: b8fc073e29458b3df2dd57d4f3284a9392575479 Unapplied: dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df fstat: a62c653906870422edef5f6388dac9f76c953e35 diff --git a/patches/fork-connect b/patches/fork-connect index 0279a015..aea92bc6 100644 --- a/patches/fork-connect +++ b/patches/fork-connect @@ -1,5 +1,5 @@ Bottom: 3ea2748a5c41b11a2e7033c56bddd938d2770b6c -Top: 0841906224bb250847983ffd2a5d0bee11b39b28 +Top: b325ccfd975dd153285cfe5ba9f66efd16427780 Author: Sean Hefty Date: 2012-08-10 21:44:39 -0700 @@ -28,7 +28,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/preload.c b/src/preload.c -index b18d310..33f3baf 100644 +index b18d310..2b115d3 100644 --- a/src/preload.c +++ b/src/preload.c @@ -99,12 +99,20 @@ static int fork_support; @@ -74,7 +74,7 @@ index b18d310..33f3baf 100644 return fdi ? fdi->fd : index; } -+static inline enum fd_state fd_gets(int index) ++static inline enum fd_fork_state fd_gets(int index) +{ + struct fd_info *fdi; + @@ -214,7 +214,7 @@ index b18d310..33f3baf 100644 - real.close(fd); - return rconnect(ret, addr, addrlen); -+ ret = rconnect(ret, &sin6, len); ++ ret = rconnect(ret, &addr, len); + if (ret) + goto err2; + @@ -255,7 +255,7 @@ index b18d310..33f3baf 100644 msg = 0; - len = real.write(sfd, &msg, sizeof msg); -+ len = real.send(sfd, &msg, sizeof msg, MSG_NODELAY); ++ len = real.write(sfd, &msg, sizeof msgs); if (len != sizeof msg) goto lclose; diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 1af5415a..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,39 +0,0 @@ -Bottom: 0841906224bb250847983ffd2a5d0bee11b39b28 -Top: b325ccfd975dd153285cfe5ba9f66efd16427780 -Author: Sean Hefty -Date: 2012-08-13 14:47:35 -0700 - -Refresh of fork-connect - ---- - -diff --git a/src/preload.c b/src/preload.c -index 33f3baf..2b115d3 100644 ---- a/src/preload.c -+++ b/src/preload.c -@@ -184,7 +184,7 @@ static inline int fd_getd(int index) - return fdi ? fdi->fd : index; - } - --static inline enum fd_state fd_gets(int index) -+static inline enum fd_fork_state fd_gets(int index) - { - struct fd_info *fdi; - -@@ -514,7 +514,7 @@ static void fork_active(int socket) - if ((ret != sizeof msg) || msg) - goto err2; - -- ret = rconnect(ret, &sin6, len); -+ ret = rconnect(ret, &addr, len); - if (ret) - goto err2; - -@@ -574,7 +574,7 @@ static void fork_passive(int socket) - goto lclose; - - msg = 0; -- len = real.send(sfd, &msg, sizeof msg, MSG_NODELAY); -+ len = real.write(sfd, &msg, sizeof msgs); - if (len != sizeof msg) - goto lclose;