[44/87] fs: jffs2: replace kmalloc and memset with kzalloc
diff mbox series

Message ID 20190627174101.4291-1-huangfq.daxian@gmail.com
State New
Headers show
Series
  • Untitled series #116519
Related show

Commit Message

Fuqian Huang June 27, 2019, 5:41 p.m. UTC
kmalloc + memset(0) -> kzalloc

Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
---
 fs/jffs2/erase.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Richard Weinberger June 28, 2019, 6:56 a.m. UTC | #1
----- Urspr√ľngliche Mail -----
> Von: "Fuqian Huang" <huangfq.daxian@gmail.com>
> CC: "Fuqian Huang" <huangfq.daxian@gmail.com>, "David Woodhouse" <dwmw2@infradead.org>, "richard" <richard@nod.at>,
> "linux-mtd" <linux-mtd@lists.infradead.org>, "linux-kernel" <linux-kernel@vger.kernel.org>
> Gesendet: Donnerstag, 27. Juni 2019 19:41:00
> Betreff: [PATCH 44/87] fs: jffs2: replace kmalloc and memset with kzalloc

> kmalloc + memset(0) -> kzalloc
> 
> Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com>
> ---
> fs/jffs2/erase.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
> index 83b8f06b4a64..30c4385c6545 100644
> --- a/fs/jffs2/erase.c
> +++ b/fs/jffs2/erase.c
> @@ -43,7 +43,7 @@ static void jffs2_erase_block(struct jffs2_sb_info *c,
> 	jffs2_dbg(1, "%s(): erase block %#08x (range %#08x-%#08x)\n",
> 		  __func__,
> 		  jeb->offset, jeb->offset, jeb->offset + c->sector_size);
> -	instr = kmalloc(sizeof(struct erase_info), GFP_KERNEL);
> +	instr = kzalloc(sizeof(struct erase_info), GFP_KERNEL);
> 	if (!instr) {
> 		pr_warn("kmalloc for struct erase_info in jffs2_erase_block failed. Refiling
> 		block for later\n");

You missed this "kmalloc" instance. :-D

> 		mutex_lock(&c->erase_free_sem);
> @@ -57,8 +57,6 @@ static void jffs2_erase_block(struct jffs2_sb_info *c,
> 		return;
> 	}
> 
> -	memset(instr, 0, sizeof(*instr));
> -
> 	instr->addr = jeb->offset;
> 	instr->len = c->sector_size;

Thanks,
//richard

Patch
diff mbox series

diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index 83b8f06b4a64..30c4385c6545 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -43,7 +43,7 @@  static void jffs2_erase_block(struct jffs2_sb_info *c,
 	jffs2_dbg(1, "%s(): erase block %#08x (range %#08x-%#08x)\n",
 		  __func__,
 		  jeb->offset, jeb->offset, jeb->offset + c->sector_size);
-	instr = kmalloc(sizeof(struct erase_info), GFP_KERNEL);
+	instr = kzalloc(sizeof(struct erase_info), GFP_KERNEL);
 	if (!instr) {
 		pr_warn("kmalloc for struct erase_info in jffs2_erase_block failed. Refiling block for later\n");
 		mutex_lock(&c->erase_free_sem);
@@ -57,8 +57,6 @@  static void jffs2_erase_block(struct jffs2_sb_info *c,
 		return;
 	}
 
-	memset(instr, 0, sizeof(*instr));
-
 	instr->addr = jeb->offset;
 	instr->len = c->sector_size;