From 21439a12f2e050640867f6ba26d9c2b75495b2e5 Mon Sep 17 00:00:00 2001
From: Mark Fasheh <mark.fasheh@oracle.com>
Date: Wed, 12 Apr 2006 14:24:05 -0700
Subject: [PATCH] --- yaml --- r: 26768 b: refs/heads/master c:
 dd4a2c2bfe159cc39e9672e875c8314563699764 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4a53a3d6b6a3..aed6ce9dd895 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4374f8a6093fbee42ac4368b3ca180d1d0c7c6d
+refs/heads/master: dd4a2c2bfe159cc39e9672e875c8314563699764
diff --git a/trunk/fs/ocfs2/journal.c b/trunk/fs/ocfs2/journal.c
index 6a610ae53583..c53d505cbd47 100644
--- a/trunk/fs/ocfs2/journal.c
+++ b/trunk/fs/ocfs2/journal.c
@@ -870,9 +870,11 @@ static int ocfs2_force_read_journal(struct inode *inode)
 		if (p_blocks > CONCURRENT_JOURNAL_FILL)
 			p_blocks = CONCURRENT_JOURNAL_FILL;
 
+		/* We are reading journal data which should not
+		 * be put in the uptodate cache */
 		status = ocfs2_read_blocks(OCFS2_SB(inode->i_sb),
 					   p_blkno, p_blocks, bhs, 0,
-					   inode);
+					   NULL);
 		if (status < 0) {
 			mlog_errno(status);
 			goto bail;