From a316a79a742c0af9f01dada745b7d84af9e6285f Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Thu, 25 Nov 2010 01:53:13 +0900
Subject: [PATCH] --- yaml --- r: 229088 b: refs/heads/master c:
 156e74312f1ffc0a2639c24c771c5a0e106f0505 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext3/inode.c | 6 ++++--
 trunk/fs/ext3/namei.c | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c4aa6dab46ea..b8f0709a76ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41dc6385bd6cd3366c1b4bede33688521eb21db9
+refs/heads/master: 156e74312f1ffc0a2639c24c771c5a0e106f0505
diff --git a/trunk/fs/ext3/inode.c b/trunk/fs/ext3/inode.c
index a9580617edd2..ae94f6d949f5 100644
--- a/trunk/fs/ext3/inode.c
+++ b/trunk/fs/ext3/inode.c
@@ -2145,13 +2145,15 @@ static void ext3_clear_blocks(handle_t *handle, struct inode *inode,
 	if (try_to_extend_transaction(handle, inode)) {
 		if (bh) {
 			BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
-			ext3_journal_dirty_metadata(handle, bh);
+			if (ext3_journal_dirty_metadata(handle, bh))
+				return;
 		}
 		ext3_mark_inode_dirty(handle, inode);
 		truncate_restart_transaction(handle, inode);
 		if (bh) {
 			BUFFER_TRACE(bh, "retaking write access");
-			ext3_journal_get_write_access(handle, bh);
+			if (ext3_journal_get_write_access(handle, bh))
+				return;
 		}
 	}
 
diff --git a/trunk/fs/ext3/namei.c b/trunk/fs/ext3/namei.c
index e69eed547242..cc682ab55b73 100644
--- a/trunk/fs/ext3/namei.c
+++ b/trunk/fs/ext3/namei.c
@@ -1598,7 +1598,9 @@ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,
 			if (err)
 				goto journal_error;
 		}
-		ext3_journal_dirty_metadata(handle, frames[0].bh);
+		err = ext3_journal_dirty_metadata(handle, frames[0].bh);
+		if (err)
+			goto journal_error;
 	}
 	de = do_split(handle, dir, &bh, frame, &hinfo, &err);
 	if (!de)