refresh

diff --git a/meta b/meta
index 3f793b2772cb529e32de1ee495470fcf3e3c70ca..f9c69b9eabdb6973e0c146d6ea8c553e29694271 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 28c2e8b721e3fdf1bfe99f3931432fe8f84c216b
-Head: 6122e024071f32c1ecf638eabe1cff5aee64c40b
+Previous: 100d1365831186e98d9b9048d890fdcdf82675e8
+Head: d8a287dba3737e23dbebb8f72fc1de97413e5370
 Applied:
-  rs-iomap: d25c8115399392055d5c4fac68cc089a3d0cd330
-  refresh-temp: 6122e024071f32c1ecf638eabe1cff5aee64c40b
+  rs-iomap: d8a287dba3737e23dbebb8f72fc1de97413e5370
 Unapplied:
   riostream: dc6133820fa759fc0c480a6c01010037f6fde2c3
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f45902d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: 93fea4a0133ee9be5198c904501a510e1624c0d0
-Top:    056b8bfd424c0057063f61bff98567c021510bde
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-24 15:16:45 -0700
-
-Refresh of rs-iomap
-
----
-
-diff --git a/man/rsocket.7 b/man/rsocket.7
-index a1171fd..5ecebc2 100644
---- a/man/rsocket.7
-+++ b/man/rsocket.7
-@@ -47,7 +47,7 @@ This is also known as zero-copy support, since data is sent and
- received directly, bypassing copies into network controlled buffers.
- The following calls and options support direct data placement.
- .P
--riomap
-+riomap, riounmap, riowrite
- .TP
- off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offset)
- .TP
-@@ -91,6 +91,8 @@ RDMA_SQSIZE - Integer size of the underlying send queue.
- RDMA_RQSIZE - Integer size of the underlying receive queue.
- .TP
- RDMA_INLINE - Integer size of inline data.
-+.TP
-+RDMA_IOMAPSIZE - Integer number of remote IO mappings supported
- .P
- Note that rsockets fd's cannot be passed into non-rsocket calls.  For
- applications which must mix rsocket fd's with standard socket fd's or
-@@ -125,6 +127,8 @@ rqsize_default - default size of receive queue
- .P
- inline_default - default size of inline data
- .P
-+iomap_size - default size of remote iomapping table
-+.P
- If configuration files are not available, rsockets uses internal defaults.
- .SH "SEE ALSO"
- rdma_cm(7)

diff --git a/patches/rs-iomap b/patches/rs-iomap
index c7237b7d99ad4330080a010ae2f58d85a0c6f9e8..1c61c0cb88dd93ccf52b0cfa0a4e596c85269094 100644 (file)
--- a/patches/rs-iomap
+++ b/patches/rs-iomap
@@ -1,5 +1,5 @@
 Bottom: daf53db464152f40dc8d6f2c99844510b03f8567
-Top:    93fea4a0133ee9be5198c904501a510e1624c0d0
+Top:    056b8bfd424c0057063f61bff98567c021510bde
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-21 14:16:03 -0700
 
@@ -127,7 +127,7 @@ index 65feda9..f220c13 100644
  }
  #endif
 diff --git a/man/rsocket.7 b/man/rsocket.7
-index 2ed5ca4..a1171fd 100644
+index 2ed5ca4..5ecebc2 100644
 --- a/man/rsocket.7
 +++ b/man/rsocket.7
 @@ -6,7 +6,7 @@ rsocket \- RDMA socket API
@@ -158,7 +158,7 @@ index 2ed5ca4..a1171fd 100644
 +received directly, bypassing copies into network controlled buffers.
 +The following calls and options support direct data placement.
 +.P
-+riomap
++riomap, riounmap, riowrite
 +.TP
 +off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offset)
 +.TP
@@ -196,6 +196,24 @@ index 2ed5ca4..a1171fd 100644
  In addition to standard socket options, rsockets supports options
  specific to RDMA devices and protocols.  These options are accessible
  through rsetsockopt using SOL_RDMA option level.
+@@ -50,6 +91,8 @@ RDMA_SQSIZE - Integer size of the underlying send queue.
+ RDMA_RQSIZE - Integer size of the underlying receive queue.
+ .TP
+ RDMA_INLINE - Integer size of inline data.
++.TP
++RDMA_IOMAPSIZE - Integer number of remote IO mappings supported
+ .P
+ Note that rsockets fd's cannot be passed into non-rsocket calls.  For
+ applications which must mix rsocket fd's with standard socket fd's or
+@@ -84,6 +127,8 @@ rqsize_default - default size of receive queue
+ .P
+ inline_default - default size of inline data
+ .P
++iomap_size - default size of remote iomapping table
++.P
+ If configuration files are not available, rsockets uses internal defaults.
+ .SH "SEE ALSO"
+ rdma_cm(7)
 diff --git a/src/indexer.h b/src/indexer.h
 index 26e7f98..0c5f388 100644
 --- a/src/indexer.h