refresh (create temporary patch)

diff --git a/meta b/meta
index b2ef12f8f03ebddee1af19eb9c08e5932ef14795..073e3240e1f21137846fd04dc2bcd28956922562 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6430bb5c7e819af94f632c54d19e09e8cdc50067
-Head: e25feca85b5309386f87c67d9cc5a74610205d39
+Previous: cdaf2d76a50c27ae85593291deee41c2722b4f2d
+Head: e59f2da75c818b44fb907d948a93db244780c380
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -10,6 +10,7 @@ Applied:
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda
   waitall-buggy: e25feca85b5309386f87c67d9cc5a74610205d39
+  refresh-temp: e59f2da75c818b44fb907d948a93db244780c380
 Unapplied:
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..5c37db6
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,23 @@
+Bottom: a382695e2987cbd0d5a442f0e357413683b8c1df
+Top:    dc40d7521b90802ab52de937f20882c5d9cf6403
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-16 14:26:41 -0700
+
+Refresh of waitall-buggy
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 2edd44e..a7692c5 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1133,8 +1133,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+       fastlock_acquire(&rs->rlock);
+       do {
+               if (!rs_have_rdata(rs)) {
+-                      ret = rs_get_comp(rs, rs_nonblocking(rs, flags),
+-                                        rs_conn_have_rdata);
++                      ret = rs_get_comp(rs, rs_nonblocking(rs, flags), rs_conn_have_rdata);
+                       if (ret)
+                               break;
+               }