diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /fs/jbd2/journal.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'fs/jbd2/journal.c')
| -rw-r--r-- | fs/jbd2/journal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index b0ab5219becb..fed85388ee86 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c | |||
| @@ -913,6 +913,7 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev, | |||
| 913 | 913 | ||
| 914 | return journal; | 914 | return journal; |
| 915 | out_err: | 915 | out_err: |
| 916 | kfree(journal->j_wbuf); | ||
| 916 | jbd2_stats_proc_exit(journal); | 917 | jbd2_stats_proc_exit(journal); |
| 917 | kfree(journal); | 918 | kfree(journal); |
| 918 | return NULL; | 919 | return NULL; |
| @@ -986,6 +987,7 @@ journal_t * jbd2_journal_init_inode (struct inode *inode) | |||
| 986 | 987 | ||
| 987 | return journal; | 988 | return journal; |
| 988 | out_err: | 989 | out_err: |
| 990 | kfree(journal->j_wbuf); | ||
| 989 | jbd2_stats_proc_exit(journal); | 991 | jbd2_stats_proc_exit(journal); |
| 990 | kfree(journal); | 992 | kfree(journal); |
| 991 | return NULL; | 993 | return NULL; |