]> git.openfabrics.org - ~shefty/librdmacm.git/commitdiff
refresh (create temporary patch)
authorSean Hefty <sean.hefty@intel.com>
Mon, 13 Aug 2012 21:48:06 +0000 (14:48 -0700)
committerSean Hefty <sean.hefty@intel.com>
Mon, 13 Aug 2012 21:48:06 +0000 (14:48 -0700)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index e46530ec33300caa3efbe586be3b4a3e4ed6b82e..1e7510564fd9cb3f9148b1bcb933aea171d553bc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: 29114aa618aa141d8ac730244ecc1325d98338f5
-Head: b8fc073e29458b3df2dd57d4f3284a9392575479
+Previous: 7bd5a625ce7ee41fdd43138a19bc342d4778792c
+Head: 9800a8c1c11466127a93b2b6ee60ba74e08d946f
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   oobinline: ac51c1095f505373a6ec54b8f1d990259fb34d97
   fork-connect: b8fc073e29458b3df2dd57d4f3284a9392575479
+  refresh-temp: 9800a8c1c11466127a93b2b6ee60ba74e08d946f
 Unapplied:
   dbg-out: 04273ee712db4d53efb390462c1b738bb54a57df
   fstat: a62c653906870422edef5f6388dac9f76c953e35
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..bc4102e
--- /dev/null
@@ -0,0 +1,30 @@
+Bottom: b325ccfd975dd153285cfe5ba9f66efd16427780
+Top:    3513087cec3ea33b2826cc40e6f7fcdcafbab00c
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-13 14:48:06 -0700
+
+Refresh of fork-connect
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index 2b115d3..76c473b 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -574,7 +574,7 @@ static void fork_passive(int socket)
+               goto lclose;
+       msg = 0;
+-      len = real.write(sfd, &msg, sizeof msgs);
++      len = real.write(sfd, &msg, sizeof msg);
+       if (len != sizeof msg)
+               goto lclose;
+@@ -622,7 +622,6 @@ static inline enum fd_type fd_fork_get(int index, int *fd)
+ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+       int fd, ret;
+-      long flags;
+       if (fd_get(socket, &fd) == fd_rsocket) {
+               ret = rconnect(fd, addr, addrlen);