From e096d3b27fbe6437d283d63a48e334fd3ff899ad Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 29 Apr 2014 19:59:10 -0700
Subject: [PATCH] refresh (create temporary patch)

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

diff --git a/meta b/meta
index a27d237d..9acfd551 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: f936ed4c0f8c80f5829a39ed83516a8a42d688e0
-Head: accfcc2585034f337d806fd33cf00346a4939820
+Previous: 48e5699900a2650144316ac52db1647baf4201bc
+Head: 3530ab27f527344fb0a5ba5e3b712f2c8c954f54
 Applied:
   fix-lock: accfcc2585034f337d806fd33cf00346a4939820
+  refresh-temp: 3530ab27f527344fb0a5ba5e3b712f2c8c954f54
 Unapplied:
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 00000000..3385ae23
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,26 @@
+Bottom: ed641761946bf49be187e237b92349aa8a4c29d0
+Top:    72f074a690109b0df738d72f03a06cb4b9aaff9f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2014-04-29 19:59:10 -0700
+
+Refresh of fix-lock
+
+---
+
+diff --git a/src/cma.c b/src/cma.c
+index 4fa41ff..bedc95f 100644
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -416,10 +416,10 @@ static int ucma_get_device(struct cma_id_private *id_priv, uint64_t guid)
+ 
+ 	return ERR(ENODEV);
+ match:
++	pthread_mutex_lock(&mut);
+ 	if ((ret = ucma_init_device(cma_dev)))
+-		return ret;
++		goto out;
+ 
+-	pthread_mutex_lock(&mut);
+ 	if (!cma_dev->refcnt++) {
+ 		cma_dev->pd = ibv_alloc_pd(cma_dev->verbs);
+ 		if (!cma_dev->pd) {
-- 
2.46.0