diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/llite/vvp_dev.c')
| -rw-r--r-- | drivers/staging/lustre/lustre/llite/vvp_dev.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c b/drivers/staging/lustre/lustre/llite/vvp_dev.c index b8f6a8779fd3..d16d6cfce81a 100644 --- a/drivers/staging/lustre/lustre/llite/vvp_dev.c +++ b/drivers/staging/lustre/lustre/llite/vvp_dev.c @@ -40,7 +40,6 @@ #define DEBUG_SUBSYSTEM S_LLITE - #include "../include/obd.h" #include "../include/lustre_lite.h" #include "llite_internal.h" @@ -80,7 +79,7 @@ static void *vvp_key_init(const struct lu_context *ctx, { struct vvp_thread_info *info; - OBD_SLAB_ALLOC_PTR_GFP(info, vvp_thread_kmem, GFP_NOFS); + info = kmem_cache_alloc(vvp_thread_kmem, GFP_NOFS | __GFP_ZERO); if (info == NULL) info = ERR_PTR(-ENOMEM); return info; @@ -91,7 +90,7 @@ static void vvp_key_fini(const struct lu_context *ctx, { struct vvp_thread_info *info = data; - OBD_SLAB_FREE_PTR(info, vvp_thread_kmem); + kmem_cache_free(vvp_thread_kmem, info); } static void *vvp_session_key_init(const struct lu_context *ctx, @@ -99,7 +98,7 @@ static void *vvp_session_key_init(const struct lu_context *ctx, { struct vvp_session *session; - OBD_SLAB_ALLOC_PTR_GFP(session, vvp_session_kmem, GFP_NOFS); + session = kmem_cache_alloc(vvp_session_kmem, GFP_NOFS | __GFP_ZERO); if (session == NULL) session = ERR_PTR(-ENOMEM); return session; @@ -110,10 +109,9 @@ static void vvp_session_key_fini(const struct lu_context *ctx, { struct vvp_session *session = data; - OBD_SLAB_FREE_PTR(session, vvp_session_kmem); + kmem_cache_free(vvp_session_kmem, session); } - struct lu_context_key vvp_key = { .lct_tags = LCT_CL_THREAD, .lct_init = vvp_key_init, @@ -187,7 +185,6 @@ void vvp_global_fini(void) lu_kmem_fini(vvp_caches); } - /***************************************************************************** * * mirror obd-devices into cl devices. |