From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Mon, 18 Jun 2007 18:12:36 +0000 (-0700)
Subject: ocfs2: harden buffer check during mapping of page blocks
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bce997682fe3121516f5a20cf7bad2e6029ba018;p=openwrt%2Fstaging%2Fblogic.git

ocfs2: harden buffer check during mapping of page blocks

We don't want to submit buffer_new blocks for read i/o. This actually won't
happen right now because those requests during an allocating write are all nicely
aligned. It's probably a good idea to provide an explicit check though.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
---

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index b8869fd0884f..e8d16ae12ef0 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -712,7 +712,8 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno,
 			if (!buffer_uptodate(bh))
 				set_buffer_uptodate(bh);
 		} else if (!buffer_uptodate(bh) && !buffer_delay(bh) &&
-		     (block_start < from || block_end > to)) {
+			   !buffer_new(bh) &&
+			   (block_start < from || block_end > to)) {
 			ll_rw_block(READ, 1, &bh);
 			*wait_bh++=bh;
 		}