diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-01-20 18:57:02 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-09-12 03:36:48 +0100 |
| commit | 59f704cddfbc75c9118ce0e669295e1afed6db03 (patch) | |
| tree | ead4cc75b631d7cffec31b5542f06fcb119c9ac7 | |
| parent | c52f6cc5d3e4dcb9167448614338a25a31573484 (diff) | |
NFS: Use kcalloc() when allocating arrays
commit 7d9dea915fe333357912bce2d624ee848dfbd890 upstream.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | fs/nfs/blocklayout/extents.c | 2 | ||||
| -rw-r--r-- | fs/nfs/pnfs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/blocklayout/extents.c b/fs/nfs/blocklayout/extents.c index c69682a4262..4e2ee991995 100644 --- a/fs/nfs/blocklayout/extents.c +++ b/fs/nfs/blocklayout/extents.c @@ -153,7 +153,7 @@ static int _preload_range(struct pnfs_inval_markings *marks, count = (int)(end - start) / (int)tree->mtt_step_size; /* Pre-malloc what memory we might need */ - storage = kmalloc(sizeof(*storage) * count, GFP_NOFS); + storage = kcalloc(count, sizeof(*storage), GFP_NOFS); if (!storage) return -ENOMEM; for (i = 0; i < count; i++) { diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index f881a638794..4dfc3f17a05 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -590,7 +590,7 @@ send_layoutget(struct pnfs_layout_hdr *lo, max_resp_sz = server->nfs_client->cl_session->fc_attrs.max_resp_sz; max_pages = max_resp_sz >> PAGE_SHIFT; - pages = kzalloc(max_pages * sizeof(struct page *), gfp_flags); + pages = kcalloc(max_pages, sizeof(struct page *), gfp_flags); if (!pages) goto out_err_free; |