Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29f175d1 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

mm/readahead.c: inline ra_submit 



Commit f9acc8c7 ("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: default avatarFabian Frederick <fabf@skynet.be>
Suggested-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 55f67141

include/linux/mm.h

+0 −3
Original line number Diff line number Diff line
@@ -1875,9 +1875,6 @@ void page_cache_async_readahead(struct address_space *mapping, 
				unsigned long size);



unsigned long max_sane_readahead(unsigned long nr);

unsigned long ra_submit(struct file_ra_state *ra,

			struct address_space *mapping,

			struct file *filp);



/* Generic expand stack which grows the stack according to GROWS{UP,DOWN} */

extern int expand_stack(struct vm_area_struct *vma, unsigned long address);

mm/internal.h

+15 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#ifndef __MM_INTERNAL_H

#define __MM_INTERNAL_H



#include <linux/fs.h>

#include <linux/mm.h>



void free_pgtables(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
@@ -21,6 +22,20 @@ static inline void set_page_count(struct page *page, int v) 
	atomic_set(&page->_count, v);

}



extern int __do_page_cache_readahead(struct address_space *mapping,

		struct file *filp, pgoff_t offset, unsigned long nr_to_read,

		unsigned long lookahead_size);



/*

 * Submit IO for the read-ahead request in file_ra_state.

 */

static inline unsigned long ra_submit(struct file_ra_state *ra,

		struct address_space *mapping, struct file *filp)

{

	return __do_page_cache_readahead(mapping, filp,

					ra->start, ra->size, ra->async_size);

}



/*

 * Turn a non-refcounted page (->_count == 0) into refcounted with

 * a count of one.

mm/readahead.c

+3 −18
Original line number Diff line number Diff line
@@ -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 @@ static int read_pages(struct address_space *mapping, struct file *filp, 
 *

 * 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