From d61b32957a2042ae0397c42fda1a7b938ce7288b Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 4 Feb 2013 16:49:27 -0800
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |  5 +++--
 patches/refresh-temp | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 3c84a609..f077ec92 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 96a17d06fa143c25ec3f54d18e3a10e541ed7642
-Head: c4de9a2fb65a041bec530d7eda0189562cfb1770
+Previous: b99e5468988877b9c174b751a7a2bbd5a4c284b4
+Head: b90b13775adf91f6c498e7a8da534342bbe34f60
 Applied:
   kern-bug: c4de9a2fb65a041bec530d7eda0189562cfb1770
+  refresh-temp: b90b13775adf91f6c498e7a8da534342bbe34f60
 Unapplied:
   af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae
   addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..d20c3489
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,38 @@
+Bottom: 3a5e1771417c34940355c5d56136e2c805bc2e4f
+Top:    1f293108ce283eca535112af13051a53881e8db9
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-02-04 16:49:26 -0800
+
+Refresh of kern-bug
+
+---
+
+diff --git a/src/cma.c b/src/cma.c
+index 7a9f6dc..918592a 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -138,6 +138,7 @@ static void ucma_cleanup(void)
+ 			ibv_close_device(cma_dev_array[cma_dev_cnt].verbs);
+ 		}
+ 
++		fastlock_destroy(&idm_lock);
+ 		free(cma_dev_array);
+ 		cma_dev_cnt = 0;
+ 	}
+@@ -279,6 +280,7 @@ err3:
+ err2:
+ 	ibv_free_device_list(dev_list);
+ err1:
++	fastlock_destroy(&idm_lock);
+ 	pthread_mutex_unlock(&mut);
+ 	return ret;
+ }
+@@ -1955,7 +1957,7 @@ retry:
+ 	} else {
+ 		evt->id_priv = ucma_lookup_id(resp.id);
+ 		if (!evt->id_priv) {
+-			fprintf(stderr, PFX "Warning: discarding unmatched "
++			syslog(LOG_WARNING, PFX "Warning: discarding unmatched "
+ 				"event - rdma_destroy_id may hang.\n");
+ 			goto retry;
+ 		}
-- 
2.46.0