From: Sean Hefty Date: Mon, 23 Jul 2012 23:28:11 +0000 (-0700) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4861acdf4cbd93d2f6e75e4590a86a1fef80f6e5;p=~shefty%2Flibrdmacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index 608ec19f..59fbc73f 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 87f25906bacb48b0e4d63a8876d043ad8707a4df -Head: 5d3b93c68e98b8d321c63a44af06d052e552a0f6 +Previous: 4ff173bd5ac93607e85ad17412c205220fee303d +Head: 733fda191323e6228bdb1efba350f663e803324b Applied: rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4 cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771 @@ -8,6 +8,7 @@ Applied: fork: 1768d762d8a2100e5250234ddf080b722a5e582f rstream-fork: 2724e02d5b461f8c580249461271de0f7acefcab fork-xfer: 5d3b93c68e98b8d321c63a44af06d052e552a0f6 + refresh-temp: 733fda191323e6228bdb1efba350f663e803324b Unapplied: dbg: 3ec7b3dd2db8422fd840e3cee062c629e7b8f5b6 waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..de470625 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,24 @@ +Bottom: 701bfad47cfeefb22f51e3977fe3629945359257 +Top: dd3e337c812c828bd16fb07d95a805d5eaaccc91 +Author: Sean Hefty +Date: 2012-07-23 16:28:11 -0700 + +Refresh of fork-xfer + +--- + +diff --git a/src/preload.c b/src/preload.c +index 82a4125..79340c6 100644 +--- a/src/preload.c ++++ b/src/preload.c +@@ -536,8 +536,8 @@ static void fork_passive(int socket) + goto lclose; + + msg = 0; +- ret = real.write(sfd, &msg, sizeof msg); +- if (ret != sizeof msg) ++ len = real.write(sfd, &msg, sizeof msg); ++ if (len != sizeof msg) + goto lclose; + + dfd = raccept(lfd, NULL, NULL);