提交 304c4c84 编写于 作者: A Andrew Morton 提交者: Linus Torvalds

[PATCH] jbd: avoid kfree(NULL)

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: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 22722051
......@@ -227,7 +227,8 @@ repeat_locked:
spin_unlock(&transaction->t_handle_lock);
spin_unlock(&journal->j_state_lock);
out:
kfree(new_transaction);
if (unlikely(new_transaction)) /* It's usually NULL */
kfree(new_transaction);
return ret;
}
......@@ -724,7 +725,8 @@ done:
journal_cancel_revoke(handle, jh);
out:
kfree(frozen_buffer);
if (unlikely(frozen_buffer)) /* It's usually NULL */
kfree(frozen_buffer);
JBUFFER_TRACE(jh, "exit");
return error;
......@@ -903,7 +905,8 @@ repeat:
jbd_unlock_bh_state(bh);
out:
journal_put_journal_head(jh);
kfree(committed_data);
if (unlikely(committed_data))
kfree(committed_data);
return err;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册