---

yaml --- r: 346577 b: refs/heads/master c: 2d473d3 h: refs/heads/master i: 346575: 6b039eb v: v3
git-mirror · Nov 21, 2012 · 0e90a8b · 0e90a8b
1 parent f39ceb2
commit 0e90a8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,