refresh

diff --git a/meta b/meta
index 1c691b55f033128551d7c513fdb4a2f3a70a96b6..14be3457a5fa9e18a37033fd46b01899c66a1838 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 6379dd55b6e990e58d7167f8575fb0a7db3f79eb
-Head: 9a5b732c2c1ba61f732a736f467d40fa7cfa3900
+Previous: a36e5a2780d3ec8a2b7243ea9600adf68ca5d6fd
+Head: 02d3e09949ffb41bdd1d8c039d582b621b8f4027
 Applied:
   rs-iomap: d8a287dba3737e23dbebb8f72fc1de97413e5370
-  riostream: ac904bf1bfb99cabb6f40b277a859f4bbf251eb2
-  refresh-temp: 9a5b732c2c1ba61f732a736f467d40fa7cfa3900
+  riostream: 02d3e09949ffb41bdd1d8c039d582b621b8f4027
 Unapplied:
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d08101c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: dfeed2f52eb6f65a9782c15a2e73c0464df3b887
-Top:    9bf2cbf6a3b5360507622b949cd1a932b15de806
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-24 15:39:27 -0700
-
-Refresh of riostream
-
----
-
-diff --git a/examples/riostream.c b/examples/riostream.c
-index cc7d888..ab0dc77 100644
---- a/examples/riostream.c
-+++ b/examples/riostream.c
-@@ -569,7 +569,7 @@ static int run(void)
-               if (ret)
-                       goto free;
- 
--              for (i = 0; i < TEST_CNT && !fork_pid; i++) {
-+              for (i = 0; i < TEST_CNT; i++) {
-                       if (test_size[i].option > size_option)
-                               continue;
-                       init_latency_test(test_size[i].size);
-@@ -582,7 +582,7 @@ static int run(void)
-               ret = dst_addr ? client_connect() : server_connect();
-               if (ret)
-                       goto free;
--              for (i = 0; i < TEST_CNT && !fork_pid; i++) {
-+              for (i = 0; i < TEST_CNT; i++) {
-                       if (test_size[i].option > size_option)
-                               continue;
-                       init_bandwidth_test(test_size[i].size);

diff --git a/patches/riostream b/patches/riostream
index dedf3e816c1b4121ed1244e0b0214f9eac3a1aee..8f59e3c571184323ccc843e641fbeccb4501a5f1 100644 (file)
--- a/patches/riostream
+++ b/patches/riostream
@@ -1,5 +1,5 @@
 Bottom: 056b8bfd424c0057063f61bff98567c021510bde
-Top:    dfeed2f52eb6f65a9782c15a2e73c0464df3b887
+Top:    9bf2cbf6a3b5360507622b949cd1a932b15de806
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-24 10:23:52 -0700
 
@@ -35,7 +35,7 @@ index 4a8b9bc..d72016d 100644
  
 diff --git a/examples/riostream.c b/examples/riostream.c
 new file mode 100644
-index 0000000..cc7d888
+index 0000000..ab0dc77
 --- /dev/null
 +++ b/examples/riostream.c
 @@ -0,0 +1,702 @@
@@ -610,7 +610,7 @@ index 0000000..cc7d888
 +              if (ret)
 +                      goto free;
 +
-+              for (i = 0; i < TEST_CNT && !fork_pid; i++) {
++              for (i = 0; i < TEST_CNT; i++) {
 +                      if (test_size[i].option > size_option)
 +                              continue;
 +                      init_latency_test(test_size[i].size);
@@ -623,7 +623,7 @@ index 0000000..cc7d888
 +              ret = dst_addr ? client_connect() : server_connect();
 +              if (ret)
 +                      goto free;
-+              for (i = 0; i < TEST_CNT && !fork_pid; i++) {
++              for (i = 0; i < TEST_CNT; i++) {
 +                      if (test_size[i].option > size_option)
 +                              continue;
 +                      init_bandwidth_test(test_size[i].size);