From: tianzy Date: Fri, 16 Feb 2007 07:00:50 +0000 (+0000) Subject: fix the warnings X-Git-Tag: v1_7_100~334 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=b541c998ca327fb22a1817be98dade1f328c2f06;hp=ed19570f0ebf8968cedda1756ffbb87d30aa9613 fix the warnings b=11471 --- diff --git a/lustre/lov/lov_internal.h b/lustre/lov/lov_internal.h index 903aeb4..7099226 100644 --- a/lustre/lov/lov_internal.h +++ b/lustre/lov/lov_internal.h @@ -71,7 +71,7 @@ struct lov_async_page { (LASSERT(((struct lov_async_page *)(c))->lap_magic == LOV_AP_MAGIC), \ (struct lov_async_page *)(c)) -extern kmem_cache_t *lov_oinfo_slab; +extern cfs_mem_cache_t *lov_oinfo_slab; static inline void lov_llh_addref(void *llhp) { diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c index a533d91..db81ef9 100644 --- a/lustre/lov/lov_obd.c +++ b/lustre/lov/lov_obd.c @@ -2628,7 +2628,7 @@ struct obd_ops lov_obd_ops = { static quota_interface_t *quota_interface; extern quota_interface_t lov_quota_interface; -kmem_cache_t *lov_oinfo_slab; +cfs_mem_cache_t *lov_oinfo_slab; int __init lov_init(void) { @@ -2636,9 +2636,8 @@ int __init lov_init(void) int rc, rc2; ENTRY; - lov_oinfo_slab = kmem_cache_create("lov_oinfo", - sizeof(struct lov_oinfo), 0, - SLAB_HWCACHE_ALIGN, NULL, NULL); + lov_oinfo_slab = cfs_mem_cache_create("lov_oinfo", + sizeof(struct lov_oinfo), 0, 0); if (lov_oinfo_slab == NULL) return -ENOMEM; lprocfs_init_vars(lov, &lvars); @@ -2652,7 +2651,7 @@ int __init lov_init(void) if (rc) { if (quota_interface) PORTAL_SYMBOL_PUT(lov_quota_interface); - rc2 = kmem_cache_destroy(lov_oinfo_slab); + rc2 = cfs_mem_cache_destroy(lov_oinfo_slab); LASSERT(rc2 == 0); } @@ -2668,7 +2667,7 @@ static void /*__exit*/ lov_exit(void) PORTAL_SYMBOL_PUT(lov_quota_interface); class_unregister_type(LUSTRE_LOV_NAME); - rc = kmem_cache_destroy(lov_oinfo_slab); + rc = cfs_mem_cache_destroy(lov_oinfo_slab); LASSERT(rc == 0); }