]> git.openfabrics.org - ~shefty/librdmacm.git/commitdiff
refresh (create temporary patch)
authorSean Hefty <sean.hefty@intel.com>
Wed, 18 Jul 2012 18:31:13 +0000 (11:31 -0700)
committerSean Hefty <sean.hefty@intel.com>
Wed, 18 Jul 2012 18:31:13 +0000 (11:31 -0700)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index 4bcdac4c708ff404849c669cb048dd5294d8d2c9..9806b475d53749f5ab66cb4915eba45c10115bfb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 18c3d2dda922fd5b3311126022a839037b29a630
-Head: d5c12aeec51e502abb9e152e2722a7ecfc0c0909
+Previous: c879a2d4b943b4fcc10f90a91e07767fce641d18
+Head: 675d7a6759f4da9091117ad3dcbb56ca73de7088
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: d5c12aeec51e502abb9e152e2722a7ecfc0c0909
+  refresh-temp: 675d7a6759f4da9091117ad3dcbb56ca73de7088
 Unapplied:
   rstream-fork: 139ce2d00d35db46877d3460c1efd6fb8d23a0c3
   dbg: d926df55f527306232be7787a15034b44d84f740
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..5ae405a
--- /dev/null
@@ -0,0 +1,24 @@
+Bottom: d4edc2731701b6ca6a94f9087e44dbb9f76ec25c
+Top:    a60724bf5aa9081e8c88db5b5cfd3786af42b333
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-18 11:31:12 -0700
+
+Refresh of fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 56c6c7d..731643d 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -471,9 +471,8 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
+       flags = real.fcntl(fd, F_GETFD);
+       real.fcntl(fd, F_SETFD, 0);
+       ret = real.connect(fd, addr, addrlen);
+-      if (ret) {
++      if (ret)
+               return ret;
+-      }
+       ret = real.recv(fd, &msg, sizeof msg, MSG_PEEK);
+       if ((ret != sizeof msg) || msg) {