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

Commit 0bb7ba6b authored by Fengguang Wu's avatar Fengguang Wu Committed by Linus Torvalds
Browse files

readahead: mmap read-around simplification 



Fold file_ra_state.mmap_hit into file_ra_state.mmap_miss and make it an int.

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 937085aa

include/linux/fs.h

+1 −2
Original line number Diff line number Diff line
@@ -703,8 +703,7 @@ struct file_ra_state { 
					   there are only # of pages ahead */



	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 */

	int mmap_miss;			/* Cache miss stat for mmap accesses */

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

	unsigned int prev_offset;	/* Offset where last read() ended in a page */

};

mm/filemap.c

+2 −2
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ retry_find: 
		 * Do we miss much more than hit in this file? If so,

		 * stop bothering with read-ahead. It will only hurt.

		 */

		if (ra->mmap_miss > ra->mmap_hit + MMAP_LOTSAMISS)

		if (ra->mmap_miss > MMAP_LOTSAMISS)

			goto no_cached_page;



		/*
@@ -1375,7 +1375,7 @@ retry_find: 
	}



	if (!did_readaround)

		ra->mmap_hit++;

		ra->mmap_miss--;



	/*

	 * We have a locked page in the page cache, now we need to check