From e07784ec9054a61e84e32ceb00ae94c0bd10b5f0 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 28 Feb 2011 13:12:38 -0500
Subject: [PATCH] --- yaml --- r: 242381 b: refs/heads/master c:
 b616844310a6c8a4ab405d3436bbb6e53cfd852f h: refs/heads/master i:   242379:
 c9bad98d430f095b4f93659dd9db87082b261440 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/page-io.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c4c5caf9df81..959a5d8fca7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d39195c33bb1b5fdcb0f416e8a0b34bfdb07a027
+refs/heads/master: b616844310a6c8a4ab405d3436bbb6e53cfd852f
diff --git a/trunk/fs/ext4/page-io.c b/trunk/fs/ext4/page-io.c
index d5c391ffad7a..0cfd03e19d7d 100644
--- a/trunk/fs/ext4/page-io.c
+++ b/trunk/fs/ext4/page-io.c
@@ -259,6 +259,11 @@ static void ext4_end_bio(struct bio *bio, int error)
 			     bi_sector >> (inode->i_blkbits - 9));
 	}
 
+	if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
+		ext4_free_io_end(io_end);
+		return;
+	}
+
 	/* Add the io_end to per-inode completed io list*/
 	spin_lock_irqsave(&EXT4_I(inode)->i_completed_io_lock, flags);
 	list_add_tail(&io_end->list, &EXT4_I(inode)->i_completed_io_list);