aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/ext3/dir.c4
-rw-r--r--fs/ext4/dir.c4
-rw-r--r--fs/splice.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
index 3c6d384a2c66..c00723a99f44 100644
--- a/fs/ext3/dir.c
+++ b/fs/ext3/dir.c
@@ -139,10 +139,10 @@ static int ext3_readdir(struct file * filp,
139 pgoff_t index = map_bh.b_blocknr >> 139 pgoff_t index = map_bh.b_blocknr >>
140 (PAGE_CACHE_SHIFT - inode->i_blkbits); 140 (PAGE_CACHE_SHIFT - inode->i_blkbits);
141 if (!ra_has_index(&filp->f_ra, index)) 141 if (!ra_has_index(&filp->f_ra, index))
142 page_cache_readahead_ondemand( 142 page_cache_sync_readahead(
143 sb->s_bdev->bd_inode->i_mapping, 143 sb->s_bdev->bd_inode->i_mapping,
144 &filp->f_ra, filp, 144 &filp->f_ra, filp,
145 NULL, index, 1); 145 index, 1);
146 filp->f_ra.prev_index = index; 146 filp->f_ra.prev_index = index;
147 bh = ext3_bread(NULL, inode, blk, 0, &err); 147 bh = ext3_bread(NULL, inode, blk, 0, &err);
148 } 148 }
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index 0a872a09fed8..3ab01c04e00c 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -138,10 +138,10 @@ static int ext4_readdir(struct file * filp,
138 pgoff_t index = map_bh.b_blocknr >> 138 pgoff_t index = map_bh.b_blocknr >>
139 (PAGE_CACHE_SHIFT - inode->i_blkbits); 139 (PAGE_CACHE_SHIFT - inode->i_blkbits);
140 if (!ra_has_index(&filp->f_ra, index)) 140 if (!ra_has_index(&filp->f_ra, index))
141 page_cache_readahead_ondemand( 141 page_cache_sync_readahead(
142 sb->s_bdev->bd_inode->i_mapping, 142 sb->s_bdev->bd_inode->i_mapping,
143 &filp->f_ra, filp, 143 &filp->f_ra, filp,
144 NULL, index, 1); 144 index, 1);
145 filp->f_ra.prev_index = index; 145 filp->f_ra.prev_index = index;
146 bh = ext4_bread(NULL, inode, blk, 0, &err); 146 bh = ext4_bread(NULL, inode, blk, 0, &err);
147 } 147 }
diff --git a/fs/splice.c b/fs/splice.c
index 6ddd0329f866..22496d2a73fa 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -295,8 +295,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
295 * readahead/allocate the rest and fill in the holes. 295 * readahead/allocate the rest and fill in the holes.
296 */ 296 */
297 if (spd.nr_pages < nr_pages) 297 if (spd.nr_pages < nr_pages)
298 page_cache_readahead_ondemand(mapping, &in->f_ra, in, 298 page_cache_sync_readahead(mapping, &in->f_ra, in,
299 NULL, index, req_pages - spd.nr_pages); 299 index, req_pages - spd.nr_pages);
300 300
301 error = 0; 301 error = 0;
302 while (spd.nr_pages < nr_pages) { 302 while (spd.nr_pages < nr_pages) {
@@ -352,7 +352,7 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
352 page = pages[page_nr]; 352 page = pages[page_nr];
353 353
354 if (PageReadahead(page)) 354 if (PageReadahead(page))
355 page_cache_readahead_ondemand(mapping, &in->f_ra, in, 355 page_cache_async_readahead(mapping, &in->f_ra, in,
356 page, index, req_pages - page_nr); 356 page, index, req_pages - page_nr);
357 357
358 /* 358 /*