From e59b13a6dddb057e97fa6439143e7e7079db0439 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 23 Jun 2006 02:05:31 -0700 Subject: [PATCH] --- yaml --- r: 29051 b: refs/heads/master c: 304c4c841a31c780a45d65e389b07706babf5d36 h: refs/heads/master i: 29049: e1928bf5ddcd144134cc68516fc3617de8d21739 29047: f10177be9b1b296de2454ea0ae16a049b2ea1e4b v: v3 --- [refs] | 2 +- trunk/fs/jbd/transaction.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9d0f996ac41b..e7d59328804b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22722051fb6bcbb95c895e68dad10d34a9db7e4d +refs/heads/master: 304c4c841a31c780a45d65e389b07706babf5d36 diff --git a/trunk/fs/jbd/transaction.c b/trunk/fs/jbd/transaction.c index ff75afe9b185..508b2ea91f43 100644 --- a/trunk/fs/jbd/transaction.c +++ b/trunk/fs/jbd/transaction.c @@ -227,7 +227,8 @@ static int start_this_handle(journal_t *journal, handle_t *handle) 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 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, 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 @@ int journal_get_undo_access(handle_t *handle, struct buffer_head *bh) jbd_unlock_bh_state(bh); out: journal_put_journal_head(jh); - kfree(committed_data); + if (unlikely(committed_data)) + kfree(committed_data); return err; }