Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit f7e839dd36fd940b0202cfb7d39b2a1b2dc59b1b

Authored by Wu Fengguang
Committed by Linus Torvalds
1 parent 1ebf26a9b3
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

readahead: move max_sane_readahead() calls into force_page_cache_readahead() 

Impact: code simplification.

Cc: Nick Piggin <npiggin@suse.de>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Cc: Ying Han <yinghan@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 4 changed files with 4 additions and 5 deletions Side-by-side Diff

... ... @@ -101,7 +101,7 @@
101 101  
102 102 ret = force_page_cache_readahead(mapping, file,
103 103 start_index,
104   - max_sane_readahead(nrpages));
  104 + nrpages);
105 105 if (ret > 0)
106 106 ret = 0;
107 107 break;
... ... @@ -1390,8 +1390,7 @@
1390 1390 if (!mapping || !mapping->a_ops || !mapping->a_ops->readpage)
1391 1391 return -EINVAL;
1392 1392  
1393   - force_page_cache_readahead(mapping, filp, index,
1394   - max_sane_readahead(nr));
  1393 + force_page_cache_readahead(mapping, filp, index, nr);
1395 1394 return 0;
1396 1395 }
1397 1396  
... ... @@ -123,8 +123,7 @@
123 123 end = vma->vm_end;
124 124 end = ((end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
125 125  
126   - force_page_cache_readahead(file->f_mapping,
127   - file, start, max_sane_readahead(end - start));
  126 + force_page_cache_readahead(file->f_mapping, file, start, end - start);
128 127 return 0;
129 128 }
130 129  
... ... @@ -210,6 +210,7 @@
210 210 if (unlikely(!mapping->a_ops->readpage && !mapping->a_ops->readpages))
211 211 return -EINVAL;
212 212  
  213 + nr_to_read = max_sane_readahead(nr_to_read);
213 214 while (nr_to_read) {
214 215 int err;
215 216