From 00505fd7fbb42d0cf6c3fb4f4d3ab16851533153 Mon Sep 17 00:00:00 2001
From: Tao Ma <tao.ma@oracle.com>
Date: Tue, 10 Nov 2009 17:13:22 +0800
Subject: [PATCH] --- yaml --- r: 168543 b: refs/heads/master c:
 7b02bec07efe1d6c7d48c786e0c1a38d28fe7245 h: refs/heads/master i:   168541:
 3768d69837c51251ce642e983dfffedf61e9de24   168539:
 4a3920c7b43b0e621b4701c3b5c6e7b298c0e332   168535:
 0a162eee269a052dade40d4f0646011bca0c7dd8   168527:
 2ed6953696b60e98989d569595e4ff55975dd473   168511:
 0e89899601be00db8433bec1f1b20c23373b67cb v: v3

---
 [refs]                  | 2 +-
 trunk/fs/jbd/journal.c  | 2 ++
 trunk/fs/jbd2/journal.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bc8a2d10b4ae..ab15a111eb97 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe8bc91c4c30122b357d197117705cfd4fabaf28
+refs/heads/master: 7b02bec07efe1d6c7d48c786e0c1a38d28fe7245
diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c
index bd3c073b485d..49d5cd6053c8 100644
--- a/trunk/fs/jbd/journal.c
+++ b/trunk/fs/jbd/journal.c
@@ -756,6 +756,7 @@ journal_t * journal_init_dev(struct block_device *bdev,
 
 	return journal;
 out_err:
+	kfree(journal->j_wbuf);
 	kfree(journal);
 	return NULL;
 }
@@ -820,6 +821,7 @@ journal_t * journal_init_inode (struct inode *inode)
 
 	return journal;
 out_err:
+	kfree(journal->j_wbuf);
 	kfree(journal);
 	return NULL;
 }
diff --git a/trunk/fs/jbd2/journal.c b/trunk/fs/jbd2/journal.c
index b0ab5219becb..fed85388ee86 100644
--- a/trunk/fs/jbd2/journal.c
+++ b/trunk/fs/jbd2/journal.c
@@ -913,6 +913,7 @@ journal_t * jbd2_journal_init_dev(struct block_device *bdev,
 
 	return journal;
 out_err:
+	kfree(journal->j_wbuf);
 	jbd2_stats_proc_exit(journal);
 	kfree(journal);
 	return NULL;
@@ -986,6 +987,7 @@ journal_t * jbd2_journal_init_inode (struct inode *inode)
 
 	return journal;
 out_err:
+	kfree(journal->j_wbuf);
 	jbd2_stats_proc_exit(journal);
 	kfree(journal);
 	return NULL;