From 32b90d6395b1c4b12455d8cc8fde4c0f5edf389f Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 14 May 2010 21:30:48 +0200
Subject: [PATCH] --- yaml --- r: 195747 b: refs/heads/master c:
 316ce2ba8e74a7bb9153b9f93adc883cb1ceb9fd h: refs/heads/master i:   195745:
 7a5dbb0ab1c833877afc3e9a93a933d386686f1c   195743:
 3de9852f902c2d619eb42a2a95dcd70e77201218 v: v3

---
 [refs]                         | 2 +-
 trunk/fs/ocfs2/dlm/dlmdomain.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3e45187bd3ad..38a477622075 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3914ed0cec6532ab4feb202424fc95ad05024497
+refs/heads/master: 316ce2ba8e74a7bb9153b9f93adc883cb1ceb9fd
diff --git a/trunk/fs/ocfs2/dlm/dlmdomain.c b/trunk/fs/ocfs2/dlm/dlmdomain.c
index e82c0537eff9..6b5a492e1749 100644
--- a/trunk/fs/ocfs2/dlm/dlmdomain.c
+++ b/trunk/fs/ocfs2/dlm/dlmdomain.c
@@ -1523,7 +1523,7 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
 		goto leave;
 	}
 
-	dlm->name = kmalloc(strlen(domain) + 1, GFP_KERNEL);
+	dlm->name = kstrdup(domain, GFP_KERNEL);
 	if (dlm->name == NULL) {
 		mlog_errno(-ENOMEM);
 		kfree(dlm);
@@ -1557,7 +1557,6 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
 	for (i = 0; i < DLM_HASH_BUCKETS; i++)
 		INIT_HLIST_HEAD(dlm_master_hash(dlm, i));
 
-	strcpy(dlm->name, domain);
 	dlm->key = key;
 	dlm->node_num = o2nm_this_node();