diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-01-20 18:57:02 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-01-31 19:28:22 -0500 |
commit | 7d9dea915fe333357912bce2d624ee848dfbd890 (patch) | |
tree | 885fe85b4439080e15cfaba67e6ab9e179244a05 /fs/nfs | |
parent | 4601df20fb3bf2b87e248abc622b8a7e4c3059fb (diff) |
NFS: Use kcalloc() when allocating arrays
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-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 1abac09f7cd5..1f9a6032796b 100644 --- a/fs/nfs/blocklayout/extents.c +++ b/fs/nfs/blocklayout/extents.c | |||
@@ -147,7 +147,7 @@ static int _preload_range(struct pnfs_inval_markings *marks, | |||
147 | count = (int)(end - start) / (int)tree->mtt_step_size; | 147 | count = (int)(end - start) / (int)tree->mtt_step_size; |
148 | 148 | ||
149 | /* Pre-malloc what memory we might need */ | 149 | /* Pre-malloc what memory we might need */ |
150 | storage = kmalloc(sizeof(*storage) * count, GFP_NOFS); | 150 | storage = kcalloc(count, sizeof(*storage), GFP_NOFS); |
151 | if (!storage) | 151 | if (!storage) |
152 | return -ENOMEM; | 152 | return -ENOMEM; |
153 | for (i = 0; i < count; i++) { | 153 | for (i = 0; i < count; i++) { |
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 17149a490065..92927878c2f8 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c | |||
@@ -590,7 +590,7 @@ send_layoutget(struct pnfs_layout_hdr *lo, | |||
590 | max_resp_sz = server->nfs_client->cl_session->fc_attrs.max_resp_sz; | 590 | max_resp_sz = server->nfs_client->cl_session->fc_attrs.max_resp_sz; |
591 | max_pages = max_resp_sz >> PAGE_SHIFT; | 591 | max_pages = max_resp_sz >> PAGE_SHIFT; |
592 | 592 | ||
593 | pages = kzalloc(max_pages * sizeof(struct page *), gfp_flags); | 593 | pages = kcalloc(max_pages, sizeof(struct page *), gfp_flags); |
594 | if (!pages) | 594 | if (!pages) |
595 | goto out_err_free; | 595 | goto out_err_free; |
596 | 596 | ||