From 0e90a8bed6553ba178741b918b9534b2b696fdbb Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Mon, 19 Nov 2012 18:03:22 -0500 Subject: [PATCH] --- yaml --- r: 346577 b: refs/heads/master c: 2d473d378eb571ad77f9563653639aa35e22d39c h: refs/heads/master i: 346575: 6b039ebb15c07336b4e17c741e093d324edda81e v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4proc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d90c10109319..6c18257908ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43095d397219aa1898db23937b03c1215ef16a37 +refs/heads/master: 2d473d378eb571ad77f9563653639aa35e22d39c diff --git a/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c index 1ac339b4f092..0402ebb9b490 100644 --- a/trunk/fs/nfs/nfs4proc.c +++ b/trunk/fs/nfs/nfs4proc.c @@ -5658,7 +5658,7 @@ int nfs4_proc_get_lease_time(struct nfs_client *clp, struct nfs_fsinfo *fsinfo) static struct nfs4_slot *nfs4_alloc_slots(u32 max_slots, gfp_t gfp_flags) { - return kcalloc(max_slots, sizeof(struct nfs4_slot), gfp_flags); + return kmalloc_array(max_slots, sizeof(struct nfs4_slot), gfp_flags); } static void nfs4_add_and_init_slots(struct nfs4_slot_table *tbl,