2011-06-13 20:25:15

by Jesper Juhl

Subject: [PATCH/Trivial] jffs2: Avoid unneeded 'if' before kfree

kfree() deals gracefully with NULL pointers, so it's pointless to test for
one prior to calling it.
This removes such a test from jffs2_scan_medium().

Signed-off-by: Jesper Juhl <[email protected]>
---
scan.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/jffs2/scan.c b/fs/jffs2/scan.c
index 8d8cd34..28107ca 100644
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -275,9 +275,7 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
else
c->mtd->unpoint(c->mtd, 0, c->mtd->size);
#endif
- if (s)
- kfree(s);
-
+ kfree(s);
return ret;
}


--
Jesper Juhl <[email protected]> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.

2011-06-22 05:34:37

by Artem Bityutskiy

Subject: Re: [PATCH/Trivial] jffs2: Avoid unneeded 'if' before kfree

On Mon, 2011-06-13 at 22:16 +0200, Jesper Juhl wrote:
> kfree() deals gracefully with NULL pointers, so it's pointless to test for
> one prior to calling it.
> This removes such a test from jffs2_scan_medium().
>
> Signed-off-by: Jesper Juhl <[email protected]>

Pushed to l2-mtd-2.6.git, thanks!

--
Best Regards,
Artem Bityutskiy