[PATCH] fs: Convert kmalloc()+memset() combo to kzalloc().

[PATCH] fs: Convert kmalloc()+memset() combo to kzalloc().

[Robert P. J. Day]

  Convert all obvious combinations of kmalloc()+memset() to single
kzalloc() in the fs/ directory.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>

---

 binfmt_elf_fdpic.c |    3 +--
 seq_file.c         |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index f86d5c9..789c1c6 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -709,12 +709,11 @@ #endif
 		return -ELIBBAD;

 	size = sizeof(*loadmap) + nloads * sizeof(*seg);
-	loadmap = kmalloc(size, GFP_KERNEL);
+	loadmap = kzalloc(size, GFP_KERNEL);
 	if (!loadmap)
 		return -ENOMEM;

 	params->loadmap = loadmap;
-	memset(loadmap, 0, size);

 	loadmap->version = ELF32_FDPIC_LOADMAP_VERSION;
 	loadmap->nsegs = nloads;
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 555b9ac..f85feba 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -31,12 +31,11 @@ int seq_open(struct file *file, struct s
 	struct seq_file *p = file->private_data;

 	if (!p) {
-		p = kmalloc(sizeof(*p), GFP_KERNEL);
+		p = kzalloc(sizeof(*p), GFP_KERNEL);
 		if (!p)
 			return -ENOMEM;
 		file->private_data = p;
 	}
-	memset(p, 0, sizeof(*p));
 	mutex_init(&p->lock);
 	p->op = op;

Re: [PATCH] fs: Convert kmalloc()+memset() combo to kzalloc().

[Jiri Slaby]

Robert P. J. Day wrote:
>   Convert all obvious combinations of kmalloc()+memset() to single
> kzalloc() in the fs/ directory.
[snip]
> diff --git a/fs/seq_file.c b/fs/seq_file.c
> index 555b9ac..f85feba 100644
> --- a/fs/seq_file.c
> +++ b/fs/seq_file.c
> @@ -31,12 +31,11 @@ int seq_open(struct file *file, struct s
>  	struct seq_file *p = file->private_data;
> 
>  	if (!p) {
> -		p = kmalloc(sizeof(*p), GFP_KERNEL);
> +		p = kzalloc(sizeof(*p), GFP_KERNEL);
>  		if (!p)
>  			return -ENOMEM;
>  		file->private_data = p;
>  	}
> -	memset(p, 0, sizeof(*p));
>  	mutex_init(&p->lock);
>  	p->op = op;

It's not the same! Previous erases it every time seq_open is called and after
your change only once -- when p == NULL.

regards,
-- 
http://www.fi.muni.cz/~xslaby/            Jiri Slaby
faculty of informatics, masaryk university, brno, cz
e-mail: jirislaby gmail com, gpg pubkey fingerprint:
B674 9967 0407 CE62 ACC8  22A0 32CC 55C3 39D4 7A7E

Re: [PATCH] fs: Convert kmalloc()+memset() combo to kzalloc().

[Alan]

>  	if (!p) {
> -		p = kmalloc(sizeof(*p), GFP_KERNEL);
> +		p = kzalloc(sizeof(*p), GFP_KERNEL);
>  		if (!p)
>  			return -ENOMEM;
>  		file->private_data = p;
>  	}
> -	memset(p, 0, sizeof(*p));
>  	mutex_init(&p->lock);
>  	p->op = op;


NAK

If p was already set (ie private data existed) the old code zeroed it,
your code does not, but only zeroes the new stuff.

Alan

Re: [PATCH] fs: Convert kmalloc()+memset() combo to kzalloc().

[Robert P. J. Day]

On Sun, 3 Dec 2006, Alan wrote:

> >  	if (!p) {
> > -		p = kmalloc(sizeof(*p), GFP_KERNEL);
> > +		p = kzalloc(sizeof(*p), GFP_KERNEL);
> >  		if (!p)
> >  			return -ENOMEM;
> >  		file->private_data = p;
> >  	}
> > -	memset(p, 0, sizeof(*p));
> >  	mutex_init(&p->lock);
> >  	p->op = op;
>
>
> NAK
>
> If p was already set (ie private data existed) the old code zeroed it,
> your code does not, but only zeroes the new stuff.

whoops, sorry, my bad.

rday