---

yaml --- r: 26768 b: refs/heads/master c: dd4a2c2 h: refs/heads/master v: v3
git-mirror · May 17, 2006 · 21439a1 · 21439a1
1 parent f651bab
commit 21439a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;