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

Commit 937085aa authored by Fengguang Wu's avatar Fengguang Wu Committed by Linus Torvalds
Browse files

readahead: compacting file_ra_state 



Use 'unsigned int' instead of 'unsigned long' for readahead sizes.

This helps reduce memory consumption on 64bit CPU when a lot of files are
opened.

CC: Andi Kleen <andi@firstfloor.org>
Signed-off-by: default avatarFengguang Wu <wfg@mail.ustc.edu.cn>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43fac94d

include/linux/fs.h

+4 −4
Original line number Diff line number Diff line
@@ -698,11 +698,11 @@ struct fown_struct { 
 */

struct file_ra_state {

	pgoff_t start;			/* where readahead started */

	unsigned long size;             /* # of readahead pages */

	unsigned long async_size;       /* do asynchronous readahead when

	unsigned int size;		/* # of readahead pages */

	unsigned int async_size;	/* do asynchronous readahead when

					   there are only # of pages ahead */



	unsigned long ra_pages;		/* Maximum readahead window */

	unsigned int ra_pages;		/* Maximum readahead window */

	unsigned long mmap_hit;		/* Cache hit stat for mmap accesses */

	unsigned long mmap_miss;	/* Cache miss stat for mmap accesses */

	unsigned long prev_index;	/* Cache last read() position */

mm/readahead.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ ondemand_readahead(struct address_space *mapping, 
		   bool hit_readahead_marker, pgoff_t offset,

		   unsigned long req_size)

{

	unsigned long max;	/* max readahead pages */

	int max;	/* max readahead pages */

	int sequential;



	max = ra->ra_pages;