---

yaml
---
r: 189231
b: refs/heads/master
c: 1474147
h: refs/heads/master
i:
  189229: 32afb46
  189227: 5f85506
  189223: 5560f1d
  189215: 23b758e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b54c2ca475fa7d7450a45b6d778dae9dbe0bcbfe
+refs/heads/master: 14741472a05245ed5778aa0aec055e1f920b6ef8

trunk/fs/ocfs2/dlm/dlmmaster.c

@@ -1875,7 +1875,6 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data,
 ok:
 		spin_unlock(&res->spinlock);
 	}
-	spin_unlock(&dlm->spinlock);
 
 	// mlog(0, "woo!  got an assert_master from node %u!\n",
 	// 	     assert->node_idx);
@@ -1926,7 +1925,6 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data,
 		/* master is known, detach if not already detached.
 		 * ensures that only one assert_master call will happen
 		 * on this mle. */
-		spin_lock(&dlm->spinlock);
 		spin_lock(&dlm->master_lock);
 
 		rr = atomic_read(&mle->mle_refs.refcount);
@@ -1959,14 +1957,14 @@ int dlm_assert_master_handler(struct o2net_msg *msg, u32 len, void *data,
 			__dlm_put_mle(mle);
 		}
 		spin_unlock(&dlm->master_lock);
-		spin_unlock(&dlm->spinlock);
 	} else if (res) {
 		if (res->owner != assert->node_idx) {
 			mlog(0, "assert_master from %u, but current "
 			     "owner is %u (%.*s), no mle\n", assert->node_idx,
 			     res->owner, namelen, name);
 		}
 	}
+	spin_unlock(&dlm->spinlock);
 
 done:
 	ret = 0;