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,
                err = ext3_get_blocks_handle(NULL, inode, blk, 1,
                                                &map_bh, 0, 0);
                if (err > 0) {
-                        page_cache_readahead(sb->s_bdev->bd_inode->i_mapping,
+                        pgoff_t index = map_bh.b_blocknr >>
-                                &filp->f_ra,
+                                        (PAGE_CACHE_SHIFT - inode->i_blkbits);
-                                filp,
+                        if (!ra_has_index(&filp->f_ra, index))
-                                map_bh.b_blocknr >>
+                                page_cache_readahead_ondemand(
-                                        (PAGE_CACHE_SHIFT - inode->i_blkbits),
+                                        sb->s_bdev->bd_inode->i_mapping,
-                                1);
+                                        &filp->f_ra, filp,
+                                        NULL, index, 1);
+                        filp->f_ra.prev_index = index;
                        bh = ext3_bread(NULL, inode, blk, 0, &err);
                }
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,
                map_bh.b_state = 0;
                err = ext4_get_blocks_wrap(NULL, inode, blk, 1, &map_bh, 0, 0);
                if (err > 0) {
-                        page_cache_readahead(sb->s_bdev->bd_inode->i_mapping,
+                        pgoff_t index = map_bh.b_blocknr >>
-                                &filp->f_ra,
+                                        (PAGE_CACHE_SHIFT - inode->i_blkbits);
-                                filp,
+                        if (!ra_has_index(&filp->f_ra, index))
-                                map_bh.b_blocknr >>
+                                page_cache_readahead_ondemand(
-                                        (PAGE_CACHE_SHIFT - inode->i_blkbits),
+                                        sb->s_bdev->bd_inode->i_mapping,
-                                1);
+                                        &filp->f_ra, filp,
+                                        NULL, index, 1);
+                        filp->f_ra.prev_index = index;
                        bh = ext4_bread(NULL, inode, blk, 0, &err);
                }

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