refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..ed02ad6
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,22 @@
+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);