From d5cd93d5db26664d6c48a1e27a23950c65dd3f5a Mon Sep 17 00:00:00 2001
From: Nick Piggin <nickpiggin@yahoo.com.au>
Date: Thu, 5 May 2005 16:15:45 -0700
Subject: [PATCH] --- yaml --- r: 1006 b: refs/heads/master c:
 f3ddbdc6267c32223035ea9bb8456a2d86f65ba1 h: refs/heads/master v: v3

---
 [refs]            |  2 +-
 trunk/fs/buffer.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d4711768feae..8995928bd4de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c8fad1829cc33e903500b41d989fa50ab196378
+refs/heads/master: f3ddbdc6267c32223035ea9bb8456a2d86f65ba1
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 6ed59497fd4d..af7c51ded2e1 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -1953,7 +1953,7 @@ static int __block_prepare_write(struct inode *inode, struct page *page,
 		if (!buffer_mapped(bh)) {
 			err = get_block(inode, block, bh, 1);
 			if (err)
-				goto out;
+				break;
 			if (buffer_new(bh)) {
 				clear_buffer_new(bh);
 				unmap_underlying_metadata(bh->b_bdev,
@@ -1995,10 +1995,12 @@ static int __block_prepare_write(struct inode *inode, struct page *page,
 	while(wait_bh > wait) {
 		wait_on_buffer(*--wait_bh);
 		if (!buffer_uptodate(*wait_bh))
-			return -EIO;
+			err = -EIO;
 	}
-	return 0;
-out:
+	if (!err)
+		return err;
+
+	/* Error case: */
 	/*
 	 * Zero out any newly allocated blocks to avoid exposing stale
 	 * data.  If BH_New is set, we know that the block was newly