refresh

diff --git a/meta b/meta
index 5b1858ff1238fd4e2d4d30fff66dfd215e6bb6f8..73a050c8cfe312108525e8bd83d4a1767c7abcc1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 65c10064315507463ff3dbc778f894505e02903e
-Head: 7c60284486e553d0595587fd82d41cf3fdd34048
+Previous: f4a01a25ac988de698abd5b834f4acb72566acd5
+Head: 5c948c6ae6c8a7ab67f14e1f75c014ea5a632409
 Applied:
-  rs-iomap: a3630da59297e20652fc7be18edc2a49d77a81bc
-  refresh-temp: 7c60284486e553d0595587fd82d41cf3fdd34048
+  rs-iomap: 5c948c6ae6c8a7ab67f14e1f75c014ea5a632409
 Unapplied:
   riostream: 6eb4cf68eb983ee1c1a2ccbc5e7ce5b0f76b568e
   iom-dbg: ac8888a35f200ffc7ef8dd831b5f62226e93624f

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f96d6fd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 7f355c2c4b9a69f80c172a756e9357d22ad478bf
-Top:    6765a0c30671e9913abf7680b7ecc2c0c4415ffc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-24 21:28:37 -0700
-
-Refresh of rs-iomap
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index afcc5b1..eb8b3f0 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -2319,7 +2319,7 @@ off_t riomap(int socket, void *buf, size_t len, int prot, int flags, off_t offse
-       int access = IBV_ACCESS_LOCAL_WRITE;
- 
-       rs = idm_at(&idm, socket);
--      if ((rs->state != rs_connect_rdwr) || (prot & ~(PROT_WRITE | PROT_NONE)))
-+      if (rs->cm_id->pd || (prot & ~(PROT_WRITE | PROT_NONE)))
-               return ERR(EINVAL);
- 
-       fastlock_acquire(&rs->iomap_lock);

diff --git a/patches/rs-iomap b/patches/rs-iomap
index 8526ed9a82919f61fca3800413d75b8e1a62866e..677a9a9919ff4a4026f3263b47c749ae01b3cf5b 100644 (file)
--- a/patches/rs-iomap
+++ b/patches/rs-iomap
@@ -1,5 +1,5 @@
 Bottom: daf53db464152f40dc8d6f2c99844510b03f8567
-Top:    7f355c2c4b9a69f80c172a756e9357d22ad478bf
+Top:    6765a0c30671e9913abf7680b7ecc2c0c4415ffc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-21 14:16:03 -0700
 
@@ -286,7 +286,7 @@ index 5c317a3..d5ef736 100644
        local: *;
  };
 diff --git a/src/rsocket.c b/src/rsocket.c
-index cc5effe..afcc5b1 100644
+index cc5effe..eb8b3f0 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -55,6 +55,7 @@
@@ -940,7 +940,7 @@ index cc5effe..afcc5b1 100644
 +      int access = IBV_ACCESS_LOCAL_WRITE;
 +
 +      rs = idm_at(&idm, socket);
-+      if ((rs->state != rs_connect_rdwr) || (prot & ~(PROT_WRITE | PROT_NONE)))
++      if (rs->cm_id->pd || (prot & ~(PROT_WRITE | PROT_NONE)))
 +              return ERR(EINVAL);
 +
 +      fastlock_acquire(&rs->iomap_lock);