From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760306AbXLVBfx (ORCPT ); Fri, 21 Dec 2007 20:35:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753021AbXLVBdf (ORCPT ); Fri, 21 Dec 2007 20:33:35 -0500 Received: from smtp.ustc.edu.cn ([202.38.64.16]:53971 "HELO ustc.edu.cn" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1751446AbXLVBdS (ORCPT ); Fri, 21 Dec 2007 20:33:18 -0500 Message-ID: <398287206.69542@ustc.edu.cn> X-EYOUMAIL-SMTPAUTH: wfg@mail.ustc.edu.cn Message-Id: <20071222013315.268922128@mail.ustc.edu.cn> References: <20071222013147.897522982@mail.ustc.edu.cn> User-Agent: quilt/0.46-1 Date: Sat, 22 Dec 2007 09:31:53 +0800 From: Fengguang Wu To: Andrew Morton Cc: Linus Torvalds Cc: Nick Piggin Cc: linux-kernel@vger.kernel.org Subject: [PATCH 6/9] readahead: save mmap read-around states in file_ra_state Content-Disposition: inline; filename=readahead-convert-mmap-readaround.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Change mmap read-around to share the same code style and data structure with readahead code. Signed-off-by: Fengguang Wu --- mm/filemap.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) --- linux-2.6.24-rc5-mm1.orig/mm/filemap.c +++ linux-2.6.24-rc5-mm1/mm/filemap.c @@ -1334,13 +1334,15 @@ static void do_sync_mmap_readahead(struc if (ra->mmap_miss > MMAP_LOTSAMISS) return; + /* + * mmap read-around + */ ra_pages = max_sane_readahead(ra->ra_pages); if (ra_pages) { - pgoff_t start = 0; - - if (offset > ra_pages / 2) - start = offset - ra_pages / 2; - do_page_cache_readahead(mapping, file, start, ra_pages); + ra->start = max_t(long, 0, offset - ra_pages / 2); + ra->size = ra_pages; + ra->async_size = 0; + ra_submit(ra, mapping, file); } } --