refresh

diff --git a/meta b/meta
index 95855464d5989450495359d5d12f5a9189874d99..7b15b7768b83461f9cb3f333d4ba06afaf529427 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 5613cc1150a5b22f1d437f200ff79c0f0bfc0ae5
-Head: b4210b804aef136bf9f260e82a747bea6ce94aac
+Previous: 13751ae67cfdf4f8e1034da1342440846d4d2beb
+Head: 0841b5f6724681ed1859262c190a4dedf6df37e1
 Applied:
-  rs-iomap: 5c948c6ae6c8a7ab67f14e1f75c014ea5a632409
-  refresh-temp: b4210b804aef136bf9f260e82a747bea6ce94aac
+  rs-iomap: 0841b5f6724681ed1859262c190a4dedf6df37e1
 Unapplied:
   riostream: 16e4d972aa49f8ac13a96adabb47d8367a8c1f01
   iom-dbg: 7bd24be8eaf628608ef82366cce40c1f6379fcb0

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ed02ad6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 6765a0c30671e9913abf7680b7ecc2c0c4415ffc
-Top:    adbc5e044ca220d9d21d72e8b804f954a84df8bc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-24 21:52:19 -0700
-
-Refresh of rs-iomap
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index eb8b3f0..f0c4c35 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->cm_id->pd || (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 677a9a9919ff4a4026f3263b47c749ae01b3cf5b..ca7321878ccc4021854655126f6ccbfc696ef56e 100644 (file)
--- a/patches/rs-iomap
+++ b/patches/rs-iomap
@@ -1,5 +1,5 @@
 Bottom: daf53db464152f40dc8d6f2c99844510b03f8567
-Top:    6765a0c30671e9913abf7680b7ecc2c0c4415ffc
+Top:    adbc5e044ca220d9d21d72e8b804f954a84df8bc
 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..eb8b3f0 100644
+index cc5effe..f0c4c35 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -55,6 +55,7 @@
@@ -940,7 +940,7 @@ index cc5effe..eb8b3f0 100644
 +      int access = IBV_ACCESS_LOCAL_WRITE;
 +
 +      rs = idm_at(&idm, socket);
-+      if (rs->cm_id->pd || (prot & ~(PROT_WRITE | PROT_NONE)))
++      if (!rs->cm_id->pd || (prot & ~(PROT_WRITE | PROT_NONE)))
 +              return ERR(EINVAL);
 +
 +      fastlock_acquire(&rs->iomap_lock);