aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFengguang Wu <wfg@mail.ustc.edu.cn>2007-07-19 04:48:04 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:44 -0400
commitdc7868fcb9a73990e6f30371c1be465c436a7a7f (patch)
tree21dfd3e625bb4a9f78a7795f0a5b110c3dd8843e
parenta08a166fe77d9f9ad88ed6d06b97e73453661f89 (diff)
readahead: convert ext3/ext4 invocations
Convert ext3/ext4 dir reads to use on-demand readahead. Readahead for dirs operates _not_ on file level, but on blockdev level. This makes a difference when the data blocks are not continuous. And the read routine is somehow opaque: there's no handy info about the status of current page. So a simplified call scheme is employed: to call into readahead whenever the current page falls out of readahead windows. Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn> Cc: Steven Pratt <slpratt@austin.ibm.com> Cc: Ram Pai <linuxram@us.ibm.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/ext3/dir.c14
-rw-r--r--fs/ext4/dir.c14
2 files changed, 16 insertions, 12 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index 852869840f24..3c6d384a2c66 100644
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -136,12 +136,14 @@ static int ext3_readdir(struct file * filp,
136 err = ext3_get_blocks_handle(NULL, inode, blk, 1, 136 err = ext3_get_blocks_handle(NULL, inode, blk, 1,
137 &map_bh, 0, 0); 137 &map_bh, 0, 0);
138 if (err > 0) { 138 if (err > 0) {
139 page_cache_readahead(sb->s_bdev->bd_inode->i_mapping, 139 pgoff_t index = map_bh.b_blocknr >>
140 &filp->f_ra, 140 (PAGE_CACHE_SHIFT - inode->i_blkbits);
141 filp, 141 if (!ra_has_index(&filp->f_ra, index))
142 map_bh.b_blocknr >> 142 page_cache_readahead_ondemand(
143 (PAGE_CACHE_SHIFT - inode->i_blkbits), 143 sb->s_bdev->bd_inode->i_mapping,
144 1); 144 &filp->f_ra, filp,
145 NULL, index, 1);
146 filp->f_ra.prev_index = index;
145 bh = ext3_bread(NULL, inode, blk, 0, &err); 147 bh = ext3_bread(NULL, inode, blk, 0, &err);
146 } 148 }
147 149
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index e8ad06e28318..0a872a09fed8 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -135,12 +135,14 @@ static int ext4_readdir(struct file * filp,
135 map_bh.b_state = 0; 135 map_bh.b_state = 0;
136 err = ext4_get_blocks_wrap(NULL, inode, blk, 1, &map_bh, 0, 0); 136 err = ext4_get_blocks_wrap(NULL, inode, blk, 1, &map_bh, 0, 0);
137 if (err > 0) { 137 if (err > 0) {
138 page_cache_readahead(sb->s_bdev->bd_inode->i_mapping, 138 pgoff_t index = map_bh.b_blocknr >>
139 &filp->f_ra, 139 (PAGE_CACHE_SHIFT - inode->i_blkbits);
140 filp, 140 if (!ra_has_index(&filp->f_ra, index))
141 map_bh.b_blocknr >> 141 page_cache_readahead_ondemand(
142 (PAGE_CACHE_SHIFT - inode->i_blkbits), 142 sb->s_bdev->bd_inode->i_mapping,
143 1); 143 &filp->f_ra, filp,
144 NULL, index, 1);
145 filp->f_ra.prev_index = index;
144 bh = ext4_bread(NULL, inode, blk, 0, &err); 146 bh = ext4_bread(NULL, inode, blk, 0, &err);
145 } 147 }
146 148