From b80f9c74578d1a2ae817d47e4d9e75929a2a2da9 Mon Sep 17 00:00:00 2001
From: Tao Ma <boyu.mt@taobao.com>
Date: Sat, 13 Aug 2011 12:30:59 -0400
Subject: [PATCH] --- yaml --- r: 263167 b: refs/heads/master c:
 32c80b32c053dc52712dedac5e4d0aa7c93fc353 h: refs/heads/master i:   263165:
 2ccc18273735951ea6ed25b73aa94c0d3e2b5279   263163:
 a2354dd90773244068eab284ac4fa191a77ccef0   263159:
 c5cab14405c183dbc5821ad39f174bd41813d4b5   263151:
 6bccc8b4e3887923e300c6b280e4fef631c3149c   263135:
 e8ff49b04a75d8e8a17bad4258e8798ef30aafbc   263103:
 94c111a678ce4b69e7bc4a4df8099034ca962240   263039:
 21e9f9542619fb723e94f592d25d0cb56d1a0392   262911:
 174b992803edc239a54507375a44650791a28383   262655:
 19858ebdb7107076dc4b6578ee279ba3228ce04c   262143:
 10438bb1a705ac6f20e9ec7238d8999978d135f3 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/inode.c   | 9 ++++++++-
 trunk/fs/ext4/page-io.c | 6 ++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e261deec8183..c0e6f47decf7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2581fdc810889fdea97689cb62481201d579c796
+refs/heads/master: 32c80b32c053dc52712dedac5e4d0aa7c93fc353
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index 7dd698107822..762e8037c888 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -2678,8 +2678,15 @@ static void ext4_end_io_buffer_write(struct buffer_head *bh, int uptodate)
 		goto out;
 	}
 
-	io_end->flag = EXT4_IO_END_UNWRITTEN;
+	/*
+	 * It may be over-defensive here to check EXT4_IO_END_UNWRITTEN now,
+	 * but being more careful is always safe for the future change.
+	 */
 	inode = io_end->inode;
+	if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
+		io_end->flag |= EXT4_IO_END_UNWRITTEN;
+		atomic_inc(&EXT4_I(inode)->i_aiodio_unwritten);
+	}
 
 	/* Add the io_end to per-inode completed io list*/
 	spin_lock_irqsave(&EXT4_I(inode)->i_completed_io_lock, flags);
diff --git a/trunk/fs/ext4/page-io.c b/trunk/fs/ext4/page-io.c
index 430c401d0895..78839af7ce29 100644
--- a/trunk/fs/ext4/page-io.c
+++ b/trunk/fs/ext4/page-io.c
@@ -334,8 +334,10 @@ static int io_submit_add_bh(struct ext4_io_submit *io,
 	if ((io_end->num_io_pages >= MAX_IO_PAGES) &&
 	    (io_end->pages[io_end->num_io_pages-1] != io_page))
 		goto submit_and_retry;
-	if (buffer_uninit(bh))
-		io->io_end->flag |= EXT4_IO_END_UNWRITTEN;
+	if (buffer_uninit(bh) && !(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
+		io_end->flag |= EXT4_IO_END_UNWRITTEN;
+		atomic_inc(&EXT4_I(inode)->i_aiodio_unwritten);
+	}
 	io->io_end->size += bh->b_size;
 	io->io_next_block++;
 	ret = bio_add_page(io->io_bio, bh->b_page, bh->b_size, bh_offset(bh));