refresh (create temporary patch)

diff --git a/meta b/meta
index e894bf14ef053c1dbcc07107e9a6de6c57e6c905..2961ecbae00100e0949125ec8406d08f410c4584 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 96fb9610a50756c6b2a078821dd48795379742e6
-Head: 5070641f4e87250fd643f8d38b9bf8d45688499e
+Previous: 89e523c460ca1705533fe55dddd85794ffccc5f5
+Head: 4590499e2defc92d1d3253062235687cbe884ad3
 Applied:
   rs-iomap: 5070641f4e87250fd643f8d38b9bf8d45688499e
+  refresh-temp: 4590499e2defc92d1d3253062235687cbe884ad3
 Unapplied:
   riostream: a1781cc64e41a1f62ec9a41999a40f8958196073
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..85cb708
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,51 @@
+Bottom: 52637b17efade61815ce9a543e6ac319af39e10a
+Top:    f577125f6a6e9da1cf989ea2c4e933c66a84cf05
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-10-25 00:19:31 -0700
+
+Refresh of rs-iomap
+
+---
+
+diff --git a/man/rsocket.7 b/man/rsocket.7
+index dc3f9ab..bc5bb10 100644
+--- a/man/rsocket.7
++++ b/man/rsocket.7
+@@ -7,8 +7,8 @@ rsocket \- RDMA socket API
+ RDMA socket API and protocol
+ .SH "NOTES"
+ Rsockets is a protocol over RDMA that supports a socket-level API
+-for applications.  rsocket APIs are intended to match the behavior
+-of corresponding socket calls, except where noted.  rsocket
++for applications.  Rsocket APIs are intended to match the behavior
++of corresponding socket calls, except where noted.  Rsocket
+ functions match the name and function signature of socket calls,
+ with the exception that all function calls are prefixed with an 'r'.
+ .P
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 29b8c01..74dbcc7 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -78,7 +78,7 @@ static uint32_t polling_time = 10;
+  * bit 29: more data, 0 - end of transfer, 1 - more data available
+  *
+  * for data transfers:
+- * bits [28:0]: bytes transfered
++ * bits [28:0]: bytes transferred
+  * for control messages:
+  * SGL, CTRL
+  * bits [28-0]: receive credits granted
+@@ -519,13 +519,6 @@ static int rs_create_ep(struct rsocket *rs)
+       return 0;
+ }
+ 
+-/*
+-static xxx rs_acquire_iomap_mr(struct rsocket *rs, ...)
+-{
+-      TODO: write me
+-}
+-*/
+-
+ static void rs_release_iomap_mr(struct rs_iomap_mr *iomr)
+ {
+       if (atomic_dec(&iomr->refcnt))