diff options
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4idmap.c | 3 | ||||
-rw-r--r-- | fs/nfsd/nfs4state.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c index bea6b9478114..b1902ebaab41 100644 --- a/fs/nfsd/nfs4idmap.c +++ b/fs/nfsd/nfs4idmap.c | |||
@@ -573,10 +573,9 @@ idmap_lookup(struct svc_rqst *rqstp, | |||
573 | struct idmap_defer_req *mdr; | 573 | struct idmap_defer_req *mdr; |
574 | int ret; | 574 | int ret; |
575 | 575 | ||
576 | mdr = kmalloc(sizeof(*mdr), GFP_KERNEL); | 576 | mdr = kzalloc(sizeof(*mdr), GFP_KERNEL); |
577 | if (!mdr) | 577 | if (!mdr) |
578 | return -ENOMEM; | 578 | return -ENOMEM; |
579 | memset(mdr, 0, sizeof(*mdr)); | ||
580 | atomic_set(&mdr->count, 1); | 579 | atomic_set(&mdr->count, 1); |
581 | init_waitqueue_head(&mdr->waitq); | 580 | init_waitqueue_head(&mdr->waitq); |
582 | mdr->req.defer = idmap_defer; | 581 | mdr->req.defer = idmap_defer; |
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 9daa0b9feb8d..1a25c01ecdf1 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -339,8 +339,7 @@ alloc_client(struct xdr_netobj name) | |||
339 | { | 339 | { |
340 | struct nfs4_client *clp; | 340 | struct nfs4_client *clp; |
341 | 341 | ||
342 | if ((clp = kmalloc(sizeof(struct nfs4_client), GFP_KERNEL))!= NULL) { | 342 | if ((clp = kzalloc(sizeof(struct nfs4_client), GFP_KERNEL))!= NULL) { |
343 | memset(clp, 0, sizeof(*clp)); | ||
344 | if ((clp->cl_name.data = kmalloc(name.len, GFP_KERNEL)) != NULL) { | 343 | if ((clp->cl_name.data = kmalloc(name.len, GFP_KERNEL)) != NULL) { |
345 | memcpy(clp->cl_name.data, name.data, name.len); | 344 | memcpy(clp->cl_name.data, name.data, name.len); |
346 | clp->cl_name.len = name.len; | 345 | clp->cl_name.len = name.len; |