diff options
| author | Bryan Schumaker <bjschuma@netapp.com> | 2012-08-09 14:05:51 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-01 15:18:44 -0700 |
| commit | 57a51048da742c764b6ce5d028c7f334ae04d363 (patch) | |
| tree | 21a35aa29c1d04b25b7e00bc375e1cc198a01fe8 /fs/nfs/idmap.c | |
| parent | 6938867edba929a65a167a97581231e76aeb10b4 (diff) | |
| download | linux-stable-57a51048da742c764b6ce5d028c7f334ae04d363.tar.gz linux-stable-57a51048da742c764b6ce5d028c7f334ae04d363.tar.bz2 linux-stable-57a51048da742c764b6ce5d028c7f334ae04d363.zip | |
NFS: Use kzalloc() instead of kmalloc() in the idmapper
This will allocate memory that has already been zeroed, allowing us to
remove the memset later on.
Signed-off-by: Bryan Schumaker <bjchuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/idmap.c')
| -rw-r--r-- | fs/nfs/idmap.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index a850079467d8..9985a0aea5ff 100644 --- a/fs/nfs/idmap.c +++ b/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; |