UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: lustre: replace OBD_SLAB_ALLOC_PTR_GFP with kmem_cache_alloc 

The OBD_SLAB_ALLOC_PTR_GFP macro expands to call to kmem_cache_alloc,
which may be used directly.

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mike Rapoport 2015-10-20 12:39:49 +03:00 committed by Greg Kroah-Hartman
parent bbc63f56fb
commit ccaabce117
26 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/lustre/lustre/lclient/lcommon_cl.c
View File

@ -116,7 +116,7 @@ void *ccc_key_init(const struct lu_context *ctx, struct lu_context_key *key)
{ {
struct ccc_thread_info *info; struct ccc_thread_info *info;
OBD_SLAB_ALLOC_PTR_GFP(info, ccc_thread_kmem, GFP_NOFS); info = kmem_cache_alloc(ccc_thread_kmem, GFP_NOFS | __GFP_ZERO);
if (info == NULL) if (info == NULL)
info = ERR_PTR(-ENOMEM); info = ERR_PTR(-ENOMEM);
return info; return info;
@ -135,7 +135,7 @@ void *ccc_session_key_init(const struct lu_context *ctx,
{ {
struct ccc_session *session; struct ccc_session *session;
OBD_SLAB_ALLOC_PTR_GFP(session, ccc_session_kmem, GFP_NOFS); session = kmem_cache_alloc(ccc_session_kmem, GFP_NOFS | __GFP_ZERO);
if (session == NULL) if (session == NULL)
session = ERR_PTR(-ENOMEM); session = ERR_PTR(-ENOMEM);
return session; return session;
@ -251,7 +251,7 @@ int ccc_req_init(const struct lu_env *env, struct cl_device *dev,
struct ccc_req *vrq; struct ccc_req *vrq;
int result; int result;
OBD_SLAB_ALLOC_PTR_GFP(vrq, ccc_req_kmem, GFP_NOFS); vrq = kmem_cache_alloc(ccc_req_kmem, GFP_NOFS | __GFP_ZERO);
if (vrq != NULL) { if (vrq != NULL) {
cl_req_slice_add(req, &vrq->crq_cl, dev, &ccc_req_ops); cl_req_slice_add(req, &vrq->crq_cl, dev, &ccc_req_ops);
result = 0; result = 0;
@ -327,7 +327,7 @@ struct lu_object *ccc_object_alloc(const struct lu_env *env,
struct ccc_object *vob; struct ccc_object *vob;
struct lu_object *obj; struct lu_object *obj;
OBD_SLAB_ALLOC_PTR_GFP(vob, ccc_object_kmem, GFP_NOFS); vob = kmem_cache_alloc(ccc_object_kmem, GFP_NOFS | __GFP_ZERO);
if (vob != NULL) { if (vob != NULL) {
struct cl_object_header *hdr; struct cl_object_header *hdr;
@ -396,7 +396,7 @@ int ccc_lock_init(const struct lu_env *env,
CLOBINVRNT(env, obj, ccc_object_invariant(obj)); CLOBINVRNT(env, obj, ccc_object_invariant(obj));
OBD_SLAB_ALLOC_PTR_GFP(clk, ccc_lock_kmem, GFP_NOFS); clk = kmem_cache_alloc(ccc_lock_kmem, GFP_NOFS | __GFP_ZERO);
if (clk != NULL) { if (clk != NULL) {
cl_lock_slice_add(lock, &clk->clk_cl, obj, lkops); cl_lock_slice_add(lock, &clk->clk_cl, obj, lkops);
result = 0; result = 0;

2
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c
View File

@ -112,7 +112,7 @@ struct ldlm_interval *ldlm_interval_alloc(struct ldlm_lock *lock)
struct ldlm_interval *node; struct ldlm_interval *node;
LASSERT(lock->l_resource->lr_type == LDLM_EXTENT); LASSERT(lock->l_resource->lr_type == LDLM_EXTENT);
OBD_SLAB_ALLOC_PTR_GFP(node, ldlm_interval_slab, GFP_NOFS); node = kmem_cache_alloc(ldlm_interval_slab, GFP_NOFS | __GFP_ZERO);
if (node == NULL) if (node == NULL)
return NULL; return NULL;

2
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c
View File

@ -415,7 +415,7 @@ static struct ldlm_lock *ldlm_lock_new(struct ldlm_resource *resource)
if (resource == NULL) if (resource == NULL)
LBUG(); LBUG();
OBD_SLAB_ALLOC_PTR_GFP(lock, ldlm_lock_slab, GFP_NOFS); lock = kmem_cache_alloc(ldlm_lock_slab, GFP_NOFS | __GFP_ZERO);
if (lock == NULL) if (lock == NULL)
return NULL; return NULL;

2
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
View File

@ -1031,7 +1031,7 @@ static struct ldlm_resource *ldlm_resource_new(void)
struct ldlm_resource *res; struct ldlm_resource *res;
int idx; int idx;
OBD_SLAB_ALLOC_PTR_GFP(res, ldlm_resource_slab, GFP_NOFS); res = kmem_cache_alloc(ldlm_resource_slab, GFP_NOFS | __GFP_ZERO);
if (res == NULL) if (res == NULL)
return NULL; return NULL;

2
drivers/staging/lustre/lustre/llite/file.c
View File

@ -64,7 +64,7 @@ static struct ll_file_data *ll_file_data_get(void)
{ {
struct ll_file_data *fd; struct ll_file_data *fd;
OBD_SLAB_ALLOC_PTR_GFP(fd, ll_file_data_slab, GFP_NOFS); fd = kmem_cache_alloc(ll_file_data_slab, GFP_NOFS | __GFP_ZERO);
if (fd == NULL) if (fd == NULL)
return NULL; return NULL;
fd->fd_write_failed = false; fd->fd_write_failed = false;

2
drivers/staging/lustre/lustre/llite/remote_perm.c
View File

@ -61,7 +61,7 @@ static inline struct ll_remote_perm *alloc_ll_remote_perm(void)
{ {
struct ll_remote_perm *lrp; struct ll_remote_perm *lrp;
OBD_SLAB_ALLOC_PTR_GFP(lrp, ll_remote_perm_cachep, GFP_KERNEL); lrp = kmem_cache_alloc(ll_remote_perm_cachep, GFP_KERNEL | __GFP_ZERO);
if (lrp) if (lrp)
INIT_HLIST_NODE(&lrp->lrp_list); INIT_HLIST_NODE(&lrp->lrp_list);
return lrp; return lrp;

2
drivers/staging/lustre/lustre/llite/super25.c
View File

@ -53,7 +53,7 @@ static struct inode *ll_alloc_inode(struct super_block *sb)
struct ll_inode_info *lli; struct ll_inode_info *lli;
ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_ALLOC_INODE, 1); ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_ALLOC_INODE, 1);
OBD_SLAB_ALLOC_PTR_GFP(lli, ll_inode_cachep, GFP_NOFS); lli = kmem_cache_alloc(ll_inode_cachep, GFP_NOFS | __GFP_ZERO);
if (lli == NULL) if (lli == NULL)
return NULL; return NULL;

4
drivers/staging/lustre/lustre/llite/vvp_dev.c
View File

@ -79,7 +79,7 @@ static void *vvp_key_init(const struct lu_context *ctx,
{ {
struct vvp_thread_info *info; 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) if (info == NULL)
info = ERR_PTR(-ENOMEM); info = ERR_PTR(-ENOMEM);
return info; return info;
@ -98,7 +98,7 @@ static void *vvp_session_key_init(const struct lu_context *ctx,
{ {
struct vvp_session *session; 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) if (session == NULL)
session = ERR_PTR(-ENOMEM); session = ERR_PTR(-ENOMEM);
return session; return session;

2
drivers/staging/lustre/lustre/llite/xattr_cache.c
View File

@ -115,7 +115,7 @@ static int ll_xattr_cache_add(struct list_head *cache,
return -EPROTO; return -EPROTO;
} }
OBD_SLAB_ALLOC_PTR_GFP(xattr, xattr_kmem, GFP_NOFS); xattr = kmem_cache_alloc(xattr_kmem, GFP_NOFS | __GFP_ZERO);
if (xattr == NULL) { if (xattr == NULL) {
CDEBUG(D_CACHE, "failed to allocate xattr\n"); CDEBUG(D_CACHE, "failed to allocate xattr\n");
return -ENOMEM; return -ENOMEM;

6
drivers/staging/lustre/lustre/lov/lov_dev.c
View File

@ -142,7 +142,7 @@ static void *lov_key_init(const struct lu_context *ctx,
{ {
struct lov_thread_info *info; struct lov_thread_info *info;
OBD_SLAB_ALLOC_PTR_GFP(info, lov_thread_kmem, GFP_NOFS); info = kmem_cache_alloc(lov_thread_kmem, GFP_NOFS | __GFP_ZERO);
if (info != NULL) if (info != NULL)
INIT_LIST_HEAD(&info->lti_closure.clc_list); INIT_LIST_HEAD(&info->lti_closure.clc_list);
else else
@ -170,7 +170,7 @@ static void *lov_session_key_init(const struct lu_context *ctx,
{ {
struct lov_session *info; struct lov_session *info;
OBD_SLAB_ALLOC_PTR_GFP(info, lov_session_kmem, GFP_NOFS); info = kmem_cache_alloc(lov_session_kmem, GFP_NOFS | __GFP_ZERO);
if (info == NULL) if (info == NULL)
info = ERR_PTR(-ENOMEM); info = ERR_PTR(-ENOMEM);
return info; return info;
@ -261,7 +261,7 @@ static int lov_req_init(const struct lu_env *env, struct cl_device *dev,
struct lov_req *lr; struct lov_req *lr;
int result; int result;
OBD_SLAB_ALLOC_PTR_GFP(lr, lov_req_kmem, GFP_NOFS); lr = kmem_cache_alloc(lov_req_kmem, GFP_NOFS | __GFP_ZERO);
if (lr != NULL) { if (lr != NULL) {
cl_req_slice_add(req, &lr->lr_cl, dev, &lov_req_ops); cl_req_slice_add(req, &lr->lr_cl, dev, &lov_req_ops);
result = 0; result = 0;

2
drivers/staging/lustre/lustre/lov/lov_ea.c
View File

@ -100,7 +100,7 @@ struct lov_stripe_md *lsm_alloc_plain(__u16 stripe_count, int *size)
return NULL; return NULL;
for (i = 0; i < stripe_count; i++) { for (i = 0; i < stripe_count; i++) {
OBD_SLAB_ALLOC_PTR_GFP(loi, lov_oinfo_slab, GFP_NOFS); loi = kmem_cache_alloc(lov_oinfo_slab, GFP_NOFS | __GFP_ZERO);
if (loi == NULL) if (loi == NULL)
goto err; goto err;
lsm->lsm_oinfo[i] = loi; lsm->lsm_oinfo[i] = loi;

6
drivers/staging/lustre/lustre/lov/lov_lock.c
View File

@ -144,7 +144,7 @@ static struct cl_lock *lov_sublock_alloc(const struct lu_env *env,
LASSERT(idx < lck->lls_nr); LASSERT(idx < lck->lls_nr);
OBD_SLAB_ALLOC_PTR_GFP(link, lov_lock_link_kmem, GFP_NOFS); link = kmem_cache_alloc(lov_lock_link_kmem, GFP_NOFS | __GFP_ZERO);
if (link != NULL) { if (link != NULL) {
struct lov_sublock_env *subenv; struct lov_sublock_env *subenv;
struct lov_lock_sub *lls; struct lov_lock_sub *lls;
@ -1139,7 +1139,7 @@ int lov_lock_init_raid0(const struct lu_env *env, struct cl_object *obj,
struct lov_lock *lck; struct lov_lock *lck;
int result; int result;
OBD_SLAB_ALLOC_PTR_GFP(lck, lov_lock_kmem, GFP_NOFS); lck = kmem_cache_alloc(lov_lock_kmem, GFP_NOFS | __GFP_ZERO);
if (lck != NULL) { if (lck != NULL) {
cl_lock_slice_add(lock, &lck->lls_cl, obj, &lov_lock_ops); cl_lock_slice_add(lock, &lck->lls_cl, obj, &lov_lock_ops);
result = lov_lock_sub_init(env, lck, io); result = lov_lock_sub_init(env, lck, io);
@ -1175,7 +1175,7 @@ int lov_lock_init_empty(const struct lu_env *env, struct cl_object *obj,
struct lov_lock *lck; struct lov_lock *lck;
int result = -ENOMEM; int result = -ENOMEM;
OBD_SLAB_ALLOC_PTR_GFP(lck, lov_lock_kmem, GFP_NOFS); lck = kmem_cache_alloc(lov_lock_kmem, GFP_NOFS | __GFP_ZERO);
if (lck != NULL) { if (lck != NULL) {
cl_lock_slice_add(lock, &lck->lls_cl, obj, &lov_empty_lock_ops); cl_lock_slice_add(lock, &lck->lls_cl, obj, &lov_empty_lock_ops);
lck->lls_orig = lock->cll_descr; lck->lls_orig = lock->cll_descr;

2
drivers/staging/lustre/lustre/lov/lov_object.c
View File

@ -891,7 +891,7 @@ struct lu_object *lov_object_alloc(const struct lu_env *env,
struct lov_object *lov; struct lov_object *lov;
struct lu_object *obj; struct lu_object *obj;
OBD_SLAB_ALLOC_PTR_GFP(lov, lov_object_kmem, GFP_NOFS); lov = kmem_cache_alloc(lov_object_kmem, GFP_NOFS | __GFP_ZERO);
if (lov != NULL) { if (lov != NULL) {
obj = lov2lu(lov); obj = lov2lu(lov);
lu_object_init(obj, NULL, dev); lu_object_init(obj, NULL, dev);

2
drivers/staging/lustre/lustre/lov/lovsub_dev.c
View File

@ -146,7 +146,7 @@ static int lovsub_req_init(const struct lu_env *env, struct cl_device *dev,
struct lovsub_req *lsr; struct lovsub_req *lsr;
int result; int result;
OBD_SLAB_ALLOC_PTR_GFP(lsr, lovsub_req_kmem, GFP_NOFS); lsr = kmem_cache_alloc(lovsub_req_kmem, GFP_NOFS | __GFP_ZERO);
if (lsr != NULL) { if (lsr != NULL) {
cl_req_slice_add(req, &lsr->lsrq_cl, dev, &lovsub_req_ops); cl_req_slice_add(req, &lsr->lsrq_cl, dev, &lovsub_req_ops);
result = 0; result = 0;

2
drivers/staging/lustre/lustre/lov/lovsub_lock.c
View File

@ -453,7 +453,7 @@ int lovsub_lock_init(const struct lu_env *env, struct cl_object *obj,
struct lovsub_lock *lsk; struct lovsub_lock *lsk;
int result; int result;
OBD_SLAB_ALLOC_PTR_GFP(lsk, lovsub_lock_kmem, GFP_NOFS); lsk = kmem_cache_alloc(lovsub_lock_kmem, GFP_NOFS | __GFP_ZERO);
if (lsk != NULL) { if (lsk != NULL) {
INIT_LIST_HEAD(&lsk->lss_parents); INIT_LIST_HEAD(&lsk->lss_parents);
cl_lock_slice_add(lock, &lsk->lss_cl, obj, &lovsub_lock_ops); cl_lock_slice_add(lock, &lsk->lss_cl, obj, &lovsub_lock_ops);

2
drivers/staging/lustre/lustre/lov/lovsub_object.c
View File

@ -143,7 +143,7 @@ struct lu_object *lovsub_object_alloc(const struct lu_env *env,
struct lovsub_object *los; struct lovsub_object *los;
struct lu_object *obj; struct lu_object *obj;
OBD_SLAB_ALLOC_PTR_GFP(los, lovsub_object_kmem, GFP_NOFS); los = kmem_cache_alloc(lovsub_object_kmem, GFP_NOFS | __GFP_ZERO);
if (los != NULL) { if (los != NULL) {
struct cl_object_header *hdr; struct cl_object_header *hdr;

2
drivers/staging/lustre/lustre/obdclass/cl_lock.c
View File

@ -361,7 +361,7 @@ static struct cl_lock *cl_lock_alloc(const struct lu_env *env,
struct cl_lock *lock; struct cl_lock *lock;
struct lu_object_header *head; struct lu_object_header *head;
OBD_SLAB_ALLOC_PTR_GFP(lock, cl_lock_kmem, GFP_NOFS); lock = kmem_cache_alloc(cl_lock_kmem, GFP_NOFS | __GFP_ZERO);
if (lock != NULL) { if (lock != NULL) {
atomic_set(&lock->cll_ref, 1); atomic_set(&lock->cll_ref, 1);
lock->cll_descr = *descr; lock->cll_descr = *descr;

2
drivers/staging/lustre/lustre/obdclass/cl_object.c
View File

@ -661,7 +661,7 @@ static struct lu_env *cl_env_new(__u32 ctx_tags, __u32 ses_tags, void *debug)
struct lu_env *env; struct lu_env *env;
struct cl_env *cle; struct cl_env *cle;
OBD_SLAB_ALLOC_PTR_GFP(cle, cl_env_kmem, GFP_NOFS); cle = kmem_cache_alloc(cl_env_kmem, GFP_NOFS | __GFP_ZERO);
if (cle != NULL) { if (cle != NULL) {
int rc; int rc;

2
drivers/staging/lustre/lustre/obdclass/genops.c
View File

@ -68,7 +68,7 @@ static struct obd_device *obd_device_alloc(void)
{ {
struct obd_device *obd; struct obd_device *obd;
OBD_SLAB_ALLOC_PTR_GFP(obd, obd_device_cachep, GFP_NOFS); obd = kmem_cache_alloc(obd_device_cachep, GFP_NOFS | __GFP_ZERO);
if (obd != NULL) if (obd != NULL)
obd->obd_magic = OBD_DEVICE_MAGIC; obd->obd_magic = OBD_DEVICE_MAGIC;
return obd; return obd;

8
drivers/staging/lustre/lustre/obdecho/echo_client.c
View File

@ -396,7 +396,7 @@ static int echo_lock_init(const struct lu_env *env,
{ {
struct echo_lock *el; struct echo_lock *el;
OBD_SLAB_ALLOC_PTR_GFP(el, echo_lock_kmem, GFP_NOFS); el = kmem_cache_alloc(echo_lock_kmem, GFP_NOFS | __GFP_ZERO);
if (el != NULL) { if (el != NULL) {
cl_lock_slice_add(lock, &el->el_cl, obj, &echo_lock_ops); cl_lock_slice_add(lock, &el->el_cl, obj, &echo_lock_ops);
el->el_object = cl2echo_obj(obj); el->el_object = cl2echo_obj(obj);
@ -567,7 +567,7 @@ static struct lu_object *echo_object_alloc(const struct lu_env *env,
/* we're the top dev. */ /* we're the top dev. */
LASSERT(hdr == NULL); LASSERT(hdr == NULL);
OBD_SLAB_ALLOC_PTR_GFP(eco, echo_object_kmem, GFP_NOFS); eco = kmem_cache_alloc(echo_object_kmem, GFP_NOFS | __GFP_ZERO);
if (eco != NULL) { if (eco != NULL) {
struct cl_object_header *hdr = &eco->eo_hdr; struct cl_object_header *hdr = &eco->eo_hdr;
@ -630,7 +630,7 @@ static void *echo_thread_key_init(const struct lu_context *ctx,
{ {
struct echo_thread_info *info; struct echo_thread_info *info;
OBD_SLAB_ALLOC_PTR_GFP(info, echo_thread_kmem, GFP_NOFS); info = kmem_cache_alloc(echo_thread_kmem, GFP_NOFS | __GFP_ZERO);
if (info == NULL) if (info == NULL)
info = ERR_PTR(-ENOMEM); info = ERR_PTR(-ENOMEM);
return info; return info;
@ -661,7 +661,7 @@ static void *echo_session_key_init(const struct lu_context *ctx,
{ {
struct echo_session_info *session; struct echo_session_info *session;
OBD_SLAB_ALLOC_PTR_GFP(session, echo_session_kmem, GFP_NOFS); session = kmem_cache_alloc(echo_session_kmem, GFP_NOFS | __GFP_ZERO);
if (session == NULL) if (session == NULL)
session = ERR_PTR(-ENOMEM); session = ERR_PTR(-ENOMEM);
return session; return session;

2
drivers/staging/lustre/lustre/osc/osc_cache.c
View File

@ -346,7 +346,7 @@ static struct osc_extent *osc_extent_alloc(struct osc_object *obj)
{ {
struct osc_extent *ext; struct osc_extent *ext;
OBD_SLAB_ALLOC_PTR_GFP(ext, osc_extent_kmem, GFP_IOFS); ext = kmem_cache_alloc(osc_extent_kmem, GFP_IOFS | __GFP_ZERO);
if (ext == NULL) if (ext == NULL)
return NULL; return NULL;

4
drivers/staging/lustre/lustre/osc/osc_dev.c
View File

@ -122,7 +122,7 @@ static void *osc_key_init(const struct lu_context *ctx,
{ {
struct osc_thread_info *info; struct osc_thread_info *info;
OBD_SLAB_ALLOC_PTR_GFP(info, osc_thread_kmem, GFP_NOFS); info = kmem_cache_alloc(osc_thread_kmem, GFP_NOFS | __GFP_ZERO);
if (info == NULL) if (info == NULL)
info = ERR_PTR(-ENOMEM); info = ERR_PTR(-ENOMEM);
return info; return info;
@ -147,7 +147,7 @@ static void *osc_session_init(const struct lu_context *ctx,
{ {
struct osc_session *info; struct osc_session *info;
OBD_SLAB_ALLOC_PTR_GFP(info, osc_session_kmem, GFP_NOFS); info = kmem_cache_alloc(osc_session_kmem, GFP_NOFS | __GFP_ZERO);
if (info == NULL) if (info == NULL)
info = ERR_PTR(-ENOMEM); info = ERR_PTR(-ENOMEM);
return info; return info;

2
drivers/staging/lustre/lustre/osc/osc_io.c
View File

@ -803,7 +803,7 @@ int osc_req_init(const struct lu_env *env, struct cl_device *dev,
struct osc_req *or; struct osc_req *or;
int result; int result;
OBD_SLAB_ALLOC_PTR_GFP(or, osc_req_kmem, GFP_NOFS); or = kmem_cache_alloc(osc_req_kmem, GFP_NOFS | __GFP_ZERO);
if (or != NULL) { if (or != NULL) {
cl_req_slice_add(req, &or->or_cl, dev, &osc_req_ops); cl_req_slice_add(req, &or->or_cl, dev, &osc_req_ops);
result = 0; result = 0;

2
drivers/staging/lustre/lustre/osc/osc_lock.c
View File

@ -1555,7 +1555,7 @@ int osc_lock_init(const struct lu_env *env,
struct osc_lock *clk; struct osc_lock *clk;
int result; int result;
OBD_SLAB_ALLOC_PTR_GFP(clk, osc_lock_kmem, GFP_NOFS); clk = kmem_cache_alloc(osc_lock_kmem, GFP_NOFS | __GFP_ZERO);
if (clk != NULL) { if (clk != NULL) {
__u32 enqflags = lock->cll_descr.cld_enq_flags; __u32 enqflags = lock->cll_descr.cld_enq_flags;

2
drivers/staging/lustre/lustre/osc/osc_object.c
View File

@ -255,7 +255,7 @@ struct lu_object *osc_object_alloc(const struct lu_env *env,
struct osc_object *osc; struct osc_object *osc;
struct lu_object *obj; struct lu_object *obj;
OBD_SLAB_ALLOC_PTR_GFP(osc, osc_object_kmem, GFP_NOFS); osc = kmem_cache_alloc(osc_object_kmem, GFP_NOFS | __GFP_ZERO);
if (osc != NULL) { if (osc != NULL) {
obj = osc2lu(osc); obj = osc2lu(osc);
lu_object_init(obj, NULL, dev); lu_object_init(obj, NULL, dev);

2
drivers/staging/lustre/lustre/ptlrpc/client.c
View File

@ -423,7 +423,7 @@ struct ptlrpc_request *ptlrpc_request_cache_alloc(gfp_t flags)
{ {
struct ptlrpc_request *req; struct ptlrpc_request *req;
OBD_SLAB_ALLOC_PTR_GFP(req, request_cache, flags); req = kmem_cache_alloc(request_cache, flags | __GFP_ZERO);
return req; return req;
} }