From bb7f0945d2cc4761af975388948a16a310b1f53e Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 16 Aug 2012 13:30:36 -0700
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |  5 +++--
 patches/refresh-temp | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 6bb64744..eb1847ed 100644
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 4e1fbf1da1b919f715918d970d363189ea785347
-Head: aa1793e1b70c856f450fb173bf32cfa47f0f7690
+Previous: 6ace78cd21a6b168f0b1a0aaa5619657ec5f7c75
+Head: f5f686312918f8ef9291441f194b8a6bda27517a
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -10,6 +10,7 @@ Applied:
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda
   waitall-buggy: aa1793e1b70c856f450fb173bf32cfa47f0f7690
+  refresh-temp: f5f686312918f8ef9291441f194b8a6bda27517a
 Unapplied:
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..ed3e9cca
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,42 @@
+Bottom: 22a257de4ff3a8bf47adda8be0b930b2fbcc4fea
+Top:    f0b4d530a7758f20a79b3abc8f27419ecb1fc961
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-16 13:30:36 -0700
+
+Refresh of waitall-buggy
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 07c1355..13fd0da 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1077,7 +1077,7 @@ static int rs_conn_all_sends_done(struct rsocket *rs)
+ 	       !(rs->state & rs_connected);
+ }
+ 
+-static ssize_t rs_peek(struct rsocket *rs, void **buf, size_t len)
++static ssize_t rs_peek(struct rsocket *rs, void *buf, size_t len)
+ {
+ 	size_t left = len;
+ 	uint32_t end_size, rsize;
+@@ -1097,15 +1097,15 @@ static ssize_t rs_peek(struct rsocket *rs, void **buf, size_t len)
+ 
+ 		end_size = rs->rbuf_size - rbuf_offset;
+ 		if (rsize > end_size) {
+-			memcpy(*buf, &rs->rbuf[rbuf_offset], end_size);
++			memcpy(buf, &rs->rbuf[rbuf_offset], end_size);
+ 			rbuf_offset = 0;
+-			*buf += end_size;
++			buf += end_size;
+ 			rsize -= end_size;
+ 			left -= end_size;
+ 		}
+-		memcpy(*buf, &rs->rbuf[rbuf_offset], rsize);
++		memcpy(buf, &rs->rbuf[rbuf_offset], rsize);
+ 		rbuf_offset += rsize;
+-		*buf += rsize;
++		buf += rsize;
+ 	}
+ 
+ 	return len - left;
-- 
2.41.0