From 81d28c58e7c92d2ac71bf0895ab5406699417256 Mon Sep 17 00:00:00 2001 From: Wu Fengguang Date: Tue, 24 May 2011 17:12:28 -0700 Subject: [PATCH] --- yaml --- r: 250915 b: refs/heads/master c: 275b12bf5486f6f531111fd3d7dbbf01df427cfe h: refs/heads/master i: 250913: 0476348a0ef4c741e8f9e9c9174545ab573f61d6 250911: 4520d5b3104970a7b916bb0a92311e77fec9c3b6 v: v3 --- [refs] | 2 +- trunk/mm/filemap.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a0b6584a0e13..454c7fe6a12c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1495f230fa7750479c79e3656286b9183d662077 +refs/heads/master: 275b12bf5486f6f531111fd3d7dbbf01df427cfe diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c index 88354ae0b1fd..c974a2863897 100644 --- a/trunk/mm/filemap.c +++ b/trunk/mm/filemap.c @@ -1556,6 +1556,8 @@ static void do_sync_mmap_readahead(struct vm_area_struct *vma, /* If we don't want any read-ahead, don't bother */ if (VM_RandomReadHint(vma)) return; + if (!ra->ra_pages) + return; if (VM_SequentialReadHint(vma) || offset - 1 == (ra->prev_pos >> PAGE_CACHE_SHIFT)) { @@ -1578,12 +1580,10 @@ static void do_sync_mmap_readahead(struct vm_area_struct *vma, * mmap read-around */ ra_pages = max_sane_readahead(ra->ra_pages); - if (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); - } + ra->start = max_t(long, 0, offset - ra_pages / 2); + ra->size = ra_pages; + ra->async_size = 0; + ra_submit(ra, mapping, file); } /*