mm/readahead.c: inline ra_submit
Commit f9acc8c7b3
("readahead: sanify file_ra_state names") left
ra_submit with a single function call.
Move ra_submit to internal.h and inline it to save some stack. Thanks
to Andrew Morton for commenting different versions.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Suggested-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
55f67141a8
commit
29f175d125
@@ -8,9 +8,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/gfp.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/blkdev.h>
|
||||
#include <linux/backing-dev.h>
|
||||
@@ -20,6 +18,8 @@
|
||||
#include <linux/syscalls.h>
|
||||
#include <linux/file.h>
|
||||
|
||||
#include "internal.h"
|
||||
|
||||
/*
|
||||
* Initialise a struct file's readahead state. Assumes that the caller has
|
||||
* memset *ra to zero.
|
||||
@@ -149,8 +149,7 @@ out:
|
||||
*
|
||||
* Returns the number of pages requested, or the maximum amount of I/O allowed.
|
||||
*/
|
||||
static int
|
||||
__do_page_cache_readahead(struct address_space *mapping, struct file *filp,
|
||||
int __do_page_cache_readahead(struct address_space *mapping, struct file *filp,
|
||||
pgoff_t offset, unsigned long nr_to_read,
|
||||
unsigned long lookahead_size)
|
||||
{
|
||||
@@ -243,20 +242,6 @@ unsigned long max_sane_readahead(unsigned long nr)
|
||||
return min(nr, MAX_READAHEAD);
|
||||
}
|
||||
|
||||
/*
|
||||
* Submit IO for the read-ahead request in file_ra_state.
|
||||
*/
|
||||
unsigned long ra_submit(struct file_ra_state *ra,
|
||||
struct address_space *mapping, struct file *filp)
|
||||
{
|
||||
int actual;
|
||||
|
||||
actual = __do_page_cache_readahead(mapping, filp,
|
||||
ra->start, ra->size, ra->async_size);
|
||||
|
||||
return actual;
|
||||
}
|
||||
|
||||
/*
|
||||
* Set the initial window size, round to next power of 2 and square
|
||||
* for small size, x 4 for medium, and x 2 for large
|
||||
|
Reference in New Issue
Block a user