diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2008-03-10 15:16:19 -0700 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-04-18 08:56:08 -0700 |
| commit | 12eb0035d6f0466038ef2c6e5f6f9296b9b74d91 (patch) | |
| tree | db601dd2405f8beecf776338376079ed5841106b /fs | |
| parent | 53f67e33865927049b20839ce15ce0fb5b7ebe2d (diff) | |
| download | linux-12eb0035d6f0466038ef2c6e5f6f9296b9b74d91.tar.gz linux-12eb0035d6f0466038ef2c6e5f6f9296b9b74d91.tar.bz2 linux-12eb0035d6f0466038ef2c6e5f6f9296b9b74d91.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ocfs2/dlm/dlmdomain.c | 4 | ||||
| -rw-r--r-- | fs/ocfs2/dlm/dlmmaster.c | 2 |
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); |