---

yaml --- r: 333156 b: refs/heads/master c: 57a5104 h: refs/heads/master v: v3
git-mirror · Oct 1, 2012 · b608413 · b608413
1 parent 7c72c73
commit b608413
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6938867edba929a65a167a97581231e76aeb10b4
+refs/heads/master: 57a51048da742c764b6ce5d028c7f334ae04d363
diff --git a/trunk/fs/nfs/idmap.c b/trunk/fs/nfs/idmap.c
@@ -632,9 +632,6 @@ static int nfs_idmap_prepare_message(char *desc, struct idmap *idmap,
 	substring_t substr;
 	int token, ret;
 
-	memset(im,  0, sizeof(*im));
-	memset(msg, 0, sizeof(*msg));
-
 	im->im_type = IDMAP_TYPE_GROUP;
 	token = match_token(desc, nfs_idmap_tokens, &substr);
 
@@ -677,7 +674,7 @@ static int nfs_idmap_legacy_upcall(struct key_construction *cons,
 	int ret = -ENOMEM;
 
 	/* msg and im are freed in idmap_pipe_destroy_msg */
-	data = kmalloc(sizeof(*data), GFP_KERNEL);
+	data = kzalloc(sizeof(*data), GFP_KERNEL);
 	if (!data)
 		goto out1;