refresh (create temporary patch)

diff --git a/meta b/meta
index f8f177ca3a1d1da68fff757fd99aa8d3371ef1fc..d274c3b4b8ea48ac014d97c0cc8aebec723569aa 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: d792a11d6e77459751e8037cd409bb99b9fd24ba
-Head: ddf3f451c08302442ee322e0d6eafec7331169a0
+Previous: 56427bbbe19c7e542ba34972fbf7b9d7823098c4
+Head: b047dedeb5c4e3bb55f30ff7cb8668b1688d696c
 Applied:
   kern-bug: ddf3f451c08302442ee322e0d6eafec7331169a0
+  refresh-temp: b047dedeb5c4e3bb55f30ff7cb8668b1688d696c
 Unapplied:
   af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae
   addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..c6babf6
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,54 @@
+Bottom: 0a57e06aa09adc623b225bf5ee3e82b2bab97b2d
+Top:    cfa0e77e75c5916658adb6db2edde6e75c0adac2
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-02-01 22:29:32 -0800
+
+Refresh of kern-bug
+
+---
+
+diff --git a/src/cma.c b/src/cma.c
+index 863bbc4..0220f1f 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -124,7 +124,7 @@ static int cma_dev_cnt;
+ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
+ static int abi_ver = RDMA_USER_CM_MAX_ABI_VERSION;
+ int af_ib_support;
+-static struct index_map id_idm;
++static struct index_map ucma_idm;
+ 
+ static void ucma_cleanup(void)
+ {
+@@ -384,19 +384,19 @@ static void ucma_insert_id(struct cma_id_private *id_priv)
+               return;
+ 
+       pthread_mutex_lock(&mut);
+-      idm_set(&idm, id_priv->handle, rs);
++      idm_set(&ucma_idm, id_priv->handle, rs);
+       pthread_mutex_unlock(&mut);
+ }
+ 
+ static void ucma_remove_id(struct cma_id_private *id_priv)
+ {
+       if (id_priv->handle <= IDX_MAX_INDEX)
+-              idm_clear(&idm, id_priv->handle);
++              idm_clear(&ucma_idm, id_priv->handle);
+ }
+ 
+ static struct cma_id_private *ucma_lookup_id(int handle)
+ {
+-      return idm_lookup(&idm, handle);
++      return idm_lookup(&ucma_idm, handle);
+ }
+ 
+ static void ucma_free_id(struct cma_id_private *id_priv)
+@@ -1954,7 +1954,7 @@ retry:
+       if (resp.uid) {
+               evt->id_priv = (void *) (uintptr_t) resp.uid;
+       } else {
+-              evt->id_priv = ucma_lookup_id(&idm, resp.id);
++              evt->id_priv = ucma_lookup_id(resp.id);
+               if (!evt->id_priv) {
+                       fprintf(stderr, PFX "Warning: discarding unmatched "
+                               "event - rdma_destroy_id may hang.\n");