From bf61369e3ea7afc99989caa19e9d726a9d138454 Mon Sep 17 00:00:00 2001
From: Sunil Mushran <sunil.mushran@oracle.com>
Date: Mon, 10 Mar 2008 15:16:19 -0700
Subject: [PATCH] --- yaml --- r: 89575 b: refs/heads/master c:
 12eb0035d6f0466038ef2c6e5f6f9296b9b74d91 h: refs/heads/master i:   89573:
 3236a399d8d6d8aa40cc6fb39a5482a1f8485c64   89571:
 500c9e9d4d174f3a8acf2a84007a983d69160458   89567:
 a1a655ba84a6df8122a67f4dbfd54b1ac9aea4d8 v: v3

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

diff --git a/[refs] b/[refs]
index 1606cfcd4f28..10a686195973 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53f67e33865927049b20839ce15ce0fb5b7ebe2d
+refs/heads/master: 12eb0035d6f0466038ef2c6e5f6f9296b9b74d91
diff --git a/trunk/fs/ocfs2/dlm/dlmdomain.c b/trunk/fs/ocfs2/dlm/dlmdomain.c
index 0879d86113e3..2ce620742f9e 100644
--- a/trunk/fs/ocfs2/dlm/dlmdomain.c
+++ b/trunk/fs/ocfs2/dlm/dlmdomain.c
@@ -1816,8 +1816,10 @@ static int __init dlm_init(void)
 	dlm_print_version();
 
 	status = dlm_init_mle_cache();
-	if (status)
+	if (status) {
+		mlog(ML_ERROR, "Could not create o2dlm_mle slabcache\n");
 		return -1;
+	}
 
 	status = dlm_register_net_handlers();
 	if (status) {
diff --git a/trunk/fs/ocfs2/dlm/dlmmaster.c b/trunk/fs/ocfs2/dlm/dlmmaster.c
index ea6b89577860..90797c591018 100644
--- a/trunk/fs/ocfs2/dlm/dlmmaster.c
+++ b/trunk/fs/ocfs2/dlm/dlmmaster.c
@@ -507,7 +507,7 @@ static void dlm_mle_node_up(struct dlm_ctxt *dlm,
 
 int dlm_init_mle_cache(void)
 {
-	dlm_mle_cache = kmem_cache_create("dlm_mle_cache",
+	dlm_mle_cache = kmem_cache_create("o2dlm_mle",
 					  sizeof(struct dlm_master_list_entry),
 					  0, SLAB_HWCACHE_ALIGN,
 					  NULL);