From: Mike Rapoport Date: Tue, 20 Oct 2015 09:39:48 +0000 (+0300) Subject: staging: lustre: replace OBD_SLAB_ALLOC_PTR with kmem_cache_alloc X-Git-Tag: firefly_0821_release~176^2~802^2~379 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bbc63f56fb159deb3203327848968311366b83df;p=firefly-linux-kernel-4.4.55.git staging: lustre: replace OBD_SLAB_ALLOC_PTR with kmem_cache_alloc The OBD_SLAB_ALLOC_PTR macro expands to call to kmem_cache_alloc, which may be used directly. Signed-off-by: Mike Rapoport Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/osc/osc_quota.c b/drivers/staging/lustre/lustre/osc/osc_quota.c index 3b32928eb4fc..98b9bcda7981 100644 --- a/drivers/staging/lustre/lustre/osc/osc_quota.c +++ b/drivers/staging/lustre/lustre/osc/osc_quota.c @@ -35,7 +35,7 @@ static inline struct osc_quota_info *osc_oqi_alloc(u32 id) { struct osc_quota_info *oqi; - OBD_SLAB_ALLOC_PTR(oqi, osc_quota_kmem); + oqi = kmem_cache_alloc(osc_quota_kmem, GFP_NOFS | __GFP_ZERO); if (oqi != NULL) oqi->oqi_id = id;