diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:32 -0500 |
commit | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (patch) | |
tree | 7d29e81580cba854042df4e33bdc8f38bbd65d03 /fs/jbd/journal.c | |
parent | 8ee763b9c82c6ca0a59a7271ce4fa29d7baf5c09 (diff) | |
parent | b00615d163cd24fa98d155acfc1f9d81d6fe1103 (diff) |
Merge branch 'topic/core-change' into for-linus
Diffstat (limited to 'fs/jbd/journal.c')
-rw-r--r-- | fs/jbd/journal.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index bd3c073b485d..4160afad6d00 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -73,6 +73,7 @@ EXPORT_SYMBOL(journal_errno); | |||
73 | EXPORT_SYMBOL(journal_ack_err); | 73 | EXPORT_SYMBOL(journal_ack_err); |
74 | EXPORT_SYMBOL(journal_clear_err); | 74 | EXPORT_SYMBOL(journal_clear_err); |
75 | EXPORT_SYMBOL(log_wait_commit); | 75 | EXPORT_SYMBOL(log_wait_commit); |
76 | EXPORT_SYMBOL(log_start_commit); | ||
76 | EXPORT_SYMBOL(journal_start_commit); | 77 | EXPORT_SYMBOL(journal_start_commit); |
77 | EXPORT_SYMBOL(journal_force_commit_nested); | 78 | EXPORT_SYMBOL(journal_force_commit_nested); |
78 | EXPORT_SYMBOL(journal_wipe); | 79 | EXPORT_SYMBOL(journal_wipe); |
@@ -756,6 +757,7 @@ journal_t * journal_init_dev(struct block_device *bdev, | |||
756 | 757 | ||
757 | return journal; | 758 | return journal; |
758 | out_err: | 759 | out_err: |
760 | kfree(journal->j_wbuf); | ||
759 | kfree(journal); | 761 | kfree(journal); |
760 | return NULL; | 762 | return NULL; |
761 | } | 763 | } |
@@ -820,6 +822,7 @@ journal_t * journal_init_inode (struct inode *inode) | |||
820 | 822 | ||
821 | return journal; | 823 | return journal; |
822 | out_err: | 824 | out_err: |
825 | kfree(journal->j_wbuf); | ||
823 | kfree(journal); | 826 | kfree(journal); |
824 | return NULL; | 827 | return NULL; |
825 | } | 828 | } |