refresh (create temporary patch)

diff --git a/meta b/meta
index 0c03e9d814c29dc34a4b8a78f4fb8f0fcf92d471..3571012bd6218b08021c1916ada314d03ff89491 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 62d3ba97618203ad82b2a5515d08195e09a6445d
-Head: 7e015ddb5914093ecb1e7f87938f7c55f5cefde1
+Previous: 4db8c9d20ec851706ec0a5ea7e8580f80083095b
+Head: 343dcbcdf798f2c20dec55814a1e7dbf05f38be0
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
@@ -10,6 +10,7 @@ Applied:
   sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960
   fstat: a957d5786c30dfb1da9cf9345e4a639f6006fbda
   waitall-buggy: 7e015ddb5914093ecb1e7f87938f7c55f5cefde1
+  refresh-temp: 343dcbcdf798f2c20dec55814a1e7dbf05f38be0
 Unapplied:
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..096175c
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,23 @@
+Bottom: dc40d7521b90802ab52de937f20882c5d9cf6403
+Top:    a382695e2987cbd0d5a442f0e357413683b8c1df
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-16 14:27:04 -0700
+
+Refresh of waitall-buggy
+
+---
+
+diff --git a/src/rsocket.c b/src/rsocket.c
+index a7692c5..2edd44e 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -1133,7 +1133,8 @@ 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;
+               }