ocfs2/dlm: Rename slabcache dlm_mle_cache to o2dlm_mle

This patch renames dlm_mle_slabcache to prevent namespace clashes with fs/dlm.

Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

2 files changed, 4 insertions, 2 deletions

diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 0879d86113e3..2ce620742f9e 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/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/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index ea6b89577860..90797c591018 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/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);