From e5201f9d794411a7a1c0d5366cac50d27401ebd2 Mon Sep 17 00:00:00 2001
From: Chris Mason <mason@suse.com>
Date: Wed, 1 Feb 2006 03:06:49 -0800
Subject: [PATCH] --- yaml --- r: 19459 b: refs/heads/master c:
 3d4492f81dd7b486f1be0616a1ce7f73760f406e h: refs/heads/master i:   19457:
 0e4710906d34cc949c6c2aea85a06aebccb66a6e   19455:
 817dcf06711f146c87653a617271eb1ca79eb142 v: v3

---
 [refs]                      |  2 +-
 trunk/fs/reiserfs/journal.c | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 235c21e71076..d50ee09d3f5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0e851cf30f1a9bd2e2a7624e9810378d6a2b072
+refs/heads/master: 3d4492f81dd7b486f1be0616a1ce7f73760f406e
diff --git a/trunk/fs/reiserfs/journal.c b/trunk/fs/reiserfs/journal.c
index 1b2402a9a8e1..47c9f432dea5 100644
--- a/trunk/fs/reiserfs/journal.c
+++ b/trunk/fs/reiserfs/journal.c
@@ -846,6 +846,14 @@ static int write_ordered_buffers(spinlock_t * lock,
 			spin_lock(lock);
 			goto loop_next;
 		}
+		/* in theory, dirty non-uptodate buffers should never get here,
+		 * but the upper layer io error paths still have a few quirks.
+		 * Handle them here as gracefully as we can
+		 */
+		if (!buffer_uptodate(bh) && buffer_dirty(bh)) {
+			clear_buffer_dirty(bh);
+			ret = -EIO;
+		}
 		if (buffer_dirty(bh)) {
 			list_del_init(&jh->list);
 			list_add(&jh->list, &tmp);
@@ -1030,9 +1038,12 @@ static int flush_commit_list(struct super_block *s,
 	}
 
 	if (!list_empty(&jl->j_bh_list)) {
+		int ret;
 		unlock_kernel();
-		write_ordered_buffers(&journal->j_dirty_buffers_lock,
-				      journal, jl, &jl->j_bh_list);
+		ret = write_ordered_buffers(&journal->j_dirty_buffers_lock,
+					    journal, jl, &jl->j_bh_list);
+		if (ret < 0 && retval == 0)
+			retval = ret;
 		lock_kernel();
 	}
 	BUG_ON(!list_empty(&jl->j_bh_list));