Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12eb0035 authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

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: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 53f67e33

fs/ocfs2/dlm/dlmdomain.c

+3 −1
Original line number Diff line number Diff line
@@ -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) {

fs/ocfs2/dlm/dlmmaster.c

+1 −1
Original line number Diff line number Diff line
@@ -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);