From f7008e323558a3c4716cb50cced256d7c90fff94 Mon Sep 17 00:00:00 2001
From: Sunil Mushran <sunil.mushran@oracle.com>
Date: Thu, 12 Aug 2010 16:24:26 -0700
Subject: [PATCH] --- yaml --- r: 210382 b: refs/heads/master c:
 f5ce5a08a40f2086435858ddc80cb40394b082eb h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ocfs2/inode.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7f482da52428..4b44f19c3993 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc696aced9f09f05b1f927b93f5a7918017a3e49
+refs/heads/master: f5ce5a08a40f2086435858ddc80cb40394b082eb
diff --git a/trunk/fs/ocfs2/inode.c b/trunk/fs/ocfs2/inode.c
index 0492464916b1..eece3e05d9d0 100644
--- a/trunk/fs/ocfs2/inode.c
+++ b/trunk/fs/ocfs2/inode.c
@@ -488,7 +488,11 @@ static int ocfs2_read_locked_inode(struct inode *inode,
 						     OCFS2_BH_IGNORE_CACHE);
 	} else {
 		status = ocfs2_read_blocks_sync(osb, args->fi_blkno, 1, &bh);
-		if (!status)
+		/*
+		 * If buffer is in jbd, then its checksum may not have been
+		 * computed as yet.
+		 */
+		if (!status && !buffer_jbd(bh))
 			status = ocfs2_validate_inode_block(osb->sb, bh);
 	}
 	if (status < 0) {