diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /fs/jbd/commit.c | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/jbd/commit.c')
| -rw-r--r-- | fs/jbd/commit.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 2a3e310f79ef..002ad2bbc769 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c | |||
| @@ -261,10 +261,8 @@ void journal_commit_transaction(journal_t *journal) | |||
| 261 | struct buffer_head *bh = jh2bh(jh); | 261 | struct buffer_head *bh = jh2bh(jh); |
| 262 | 262 | ||
| 263 | jbd_lock_bh_state(bh); | 263 | jbd_lock_bh_state(bh); |
| 264 | if (jh->b_committed_data) { | 264 | kfree(jh->b_committed_data); |
| 265 | kfree(jh->b_committed_data); | 265 | jh->b_committed_data = NULL; |
| 266 | jh->b_committed_data = NULL; | ||
| 267 | } | ||
| 268 | jbd_unlock_bh_state(bh); | 266 | jbd_unlock_bh_state(bh); |
| 269 | } | 267 | } |
| 270 | journal_refile_buffer(journal, jh); | 268 | journal_refile_buffer(journal, jh); |