From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wu Fengguang Subject: [PATCH 06/14] readahead: move max_sane_readahead() calls into force_page_cache_readahead() Date: Tue, 07 Apr 2009 19:50:45 +0800 Message-ID: <20090407115234.430730679@intel.com> References: <20090407115039.780820496@intel.com> Return-path: Received: from mail138.messagelabs.com (mail138.messagelabs.com [216.82.249.35]) by kanga.kvack.org (Postfix) with SMTP id 6F2E85F0001 for ; Tue, 7 Apr 2009 08:00:55 -0400 (EDT) Content-Disposition: inline; filename=readahead-move-max_sane_readahead.patch Sender: owner-linux-mm@kvack.org To: Andrew Morton Cc: Benjamin Herrenschmidt , Nick Piggin , Linus Torvalds , Wu Fengguang , David Rientjes , Hugh Dickins , Ingo Molnar , Lee Schermerhorn , Mike Waychison , Peter Zijlstra , Rohit Seth , Edwin , "H. Peter Anvin" , Ying Han , LKML , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org List-Id: linux-mm.kvack.org Impact: code simplification. Cc: Nick Piggin Cc: Linus Torvalds Signed-off-by: Wu Fengguang --- mm/fadvise.c | 2 +- mm/filemap.c | 3 +-- mm/madvise.c | 3 +-- mm/readahead.c | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) --- mm.orig/mm/fadvise.c +++ mm/mm/fadvise.c @@ -101,7 +101,7 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, lof ret = force_page_cache_readahead(mapping, file, start_index, - max_sane_readahead(nrpages)); + nrpages); if (ret > 0) ret = 0; break; --- mm.orig/mm/filemap.c +++ mm/mm/filemap.c @@ -1458,8 +1458,7 @@ do_readahead(struct address_space *mappi if (!mapping || !mapping->a_ops || !mapping->a_ops->readpage) return -EINVAL; - force_page_cache_readahead(mapping, filp, index, - max_sane_readahead(nr)); + force_page_cache_readahead(mapping, filp, index, nr); return 0; } --- mm.orig/mm/madvise.c +++ mm/mm/madvise.c @@ -123,8 +123,7 @@ static long madvise_willneed(struct vm_a end = vma->vm_end; end = ((end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; - force_page_cache_readahead(file->f_mapping, - file, start, max_sane_readahead(end - start)); + force_page_cache_readahead(file->f_mapping, file, start, end - start); return 0; } --- mm.orig/mm/readahead.c +++ mm/mm/readahead.c @@ -223,6 +223,7 @@ int force_page_cache_readahead(struct ad if (unlikely(!mapping->a_ops->readpage && !mapping->a_ops->readpages)) return -EINVAL; + nr_to_read = max_sane_readahead(nr_to_read); while (nr_to_read) { int err; -- -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org