summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2006-04-12 23:24:05 +0200
committerMark Fasheh <mark.fasheh@oracle.com>2006-05-17 23:38:48 +0200
commitdd4a2c2bfe159cc39e9672e875c8314563699764 (patch)
treed858215c972c637000e2a28af85830fd4665cd89 /fs
parentocfs2: take meta data lock in ocfs2_file_aio_read() (diff)
downloadlinux-dd4a2c2bfe159cc39e9672e875c8314563699764.tar.xz
linux-dd4a2c2bfe159cc39e9672e875c8314563699764.zip
ocfs2: Don't populate uptodate cache in ocfs2_force_read_journal()
This greatly reduces the amount of memory useded during recovery. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/journal.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 6a610ae53583..c53d505cbd47 100644
--- a/fs/ocfs2/journal.c
+++ b/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;