lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] jbd: avoid kfree(NULL)

Browse Source 
There are a couple of places where JBD has to check to see whether an unneeded
memory allocation was performed.  Usually it _was_ needed, so we end up
calling kfree(NULL).  We can micro-optimise that by checking the pointer
before calling kfree().

Thanks to Steven Rostedt <rostedt@goodmis.org> for identifying this.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andrew Morton
2006-06-23 02:05:31 -07:00
committed by Linus Torvalds
parent 22722051fb
commit 304c4c841a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/jbd/transaction.c
View File

@@ -227,6 +227,7 @@ repeat_locked:
spin_unlock(&transaction->t_handle_lock); spin_unlock(&transaction->t_handle_lock);
spin_unlock(&journal->j_state_lock); spin_unlock(&journal->j_state_lock);
out: out:
if (unlikely(new_transaction)) /* It's usually NULL */
kfree(new_transaction); kfree(new_transaction);
return ret; return ret;
} }
@@ -724,6 +725,7 @@ done:
journal_cancel_revoke(handle, jh); journal_cancel_revoke(handle, jh);
out: out:
if (unlikely(frozen_buffer)) /* It's usually NULL */
kfree(frozen_buffer); kfree(frozen_buffer);
JBUFFER_TRACE(jh, "exit"); JBUFFER_TRACE(jh, "exit");
@@ -903,6 +905,7 @@ repeat:
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
out: out:
journal_put_journal_head(jh); journal_put_journal_head(jh);
if (unlikely(committed_data))
kfree(committed_data); kfree(committed_data);
return err; return err;
} }