diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 04:01:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:06 -0500 |
commit | f99d49adf527fa6f7a9c42257fa76bca6b8df1e3 (patch) | |
tree | 41dddbc336016f9dc9557cdb15300de5e599dac1 /fs/jffs2 | |
parent | 6044ec8882c726e325017bd948aa0cd94ad33abc (diff) |
[PATCH] kfree cleanup: fs
This is the fs/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in fs/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/jffs2')
-rw-r--r-- | fs/jffs2/readinode.c | 8 | ||||
-rw-r--r-- | fs/jffs2/wbuf.c | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c index 5b2a83599d73..1a96903e3ef3 100644 --- a/fs/jffs2/readinode.c +++ b/fs/jffs2/readinode.c | |||
@@ -490,7 +490,7 @@ int jffs2_do_crccheck_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *i | |||
490 | up(&f->sem); | 490 | up(&f->sem); |
491 | jffs2_do_clear_inode(c, f); | 491 | jffs2_do_clear_inode(c, f); |
492 | } | 492 | } |
493 | kfree (f); | 493 | kfree(f); |
494 | return ret; | 494 | return ret; |
495 | } | 495 | } |
496 | 496 | ||
@@ -742,10 +742,8 @@ void jffs2_do_clear_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f) | |||
742 | 742 | ||
743 | /* For symlink inodes we us f->dents to store the target path name */ | 743 | /* For symlink inodes we us f->dents to store the target path name */ |
744 | if (S_ISLNK(OFNI_EDONI_2SFFJ(f)->i_mode)) { | 744 | if (S_ISLNK(OFNI_EDONI_2SFFJ(f)->i_mode)) { |
745 | if (f->dents) { | 745 | kfree(f->dents); |
746 | kfree(f->dents); | 746 | f->dents = NULL; |
747 | f->dents = NULL; | ||
748 | } | ||
749 | } else { | 747 | } else { |
750 | fds = f->dents; | 748 | fds = f->dents; |
751 | 749 | ||
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c index 316133c626b7..7bc7f2d571f6 100644 --- a/fs/jffs2/wbuf.c +++ b/fs/jffs2/wbuf.c | |||
@@ -327,8 +327,7 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c) | |||
327 | c->wbuf_ofs = ofs + towrite; | 327 | c->wbuf_ofs = ofs + towrite; |
328 | memmove(c->wbuf, rewrite_buf + towrite, c->wbuf_len); | 328 | memmove(c->wbuf, rewrite_buf + towrite, c->wbuf_len); |
329 | /* Don't muck about with c->wbuf_inodes. False positives are harmless. */ | 329 | /* Don't muck about with c->wbuf_inodes. False positives are harmless. */ |
330 | if (buf) | 330 | kfree(buf); |
331 | kfree(buf); | ||
332 | } else { | 331 | } else { |
333 | /* OK, now we're left with the dregs in whichever buffer we're using */ | 332 | /* OK, now we're left with the dregs in whichever buffer we're using */ |
334 | if (buf) { | 333 | if (buf) { |