diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-06 13:07:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-06 13:07:41 -0700 |
| commit | 38583f095c5a8138ae2a1c9173d0fd8a9f10e8aa (patch) | |
| tree | 7ff369517a57ee59be45ecccd375d22d6157c786 /mm/truncate.c | |
| parent | 8169d3005e3bae9bff40349d7caeac5938682297 (diff) | |
| parent | 3ca9e5d36afb5c0a6ee6ceee69e507370beb59c6 (diff) | |
Merge branch 'akpm' (incoming from Andrew)
Merge misc fixes from Andrew Morton:
"13 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
agp: info leak in agpioc_info_wrap()
fs/affs/super.c: bugfix / double free
fanotify: fix -EOVERFLOW with large files on 64-bit
slub: use sysfs'es release mechanism for kmem_cache
revert "mm: vmscan: do not swap anon pages just because free+file is low"
autofs: fix lockref lookup
mm: filemap: update find_get_pages_tag() to deal with shadow entries
mm/compaction: make isolate_freepages start at pageblock boundary
MAINTAINERS: zswap/zbud: change maintainer email address
mm/page-writeback.c: fix divide by zero in pos_ratio_polynom
hugetlb: ensure hugepage access is denied if hugepages are not supported
slub: fix memcg_propagate_slab_attrs
drivers/rtc/rtc-pcf8523.c: fix month definition
Diffstat (limited to 'mm/truncate.c')
| -rw-r--r-- | mm/truncate.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mm/truncate.c b/mm/truncate.c index e5cc39ab075..6a78c814beb 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -484,14 +484,6 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping, unsigned long count = 0; int i; - /* - * Note: this function may get called on a shmem/tmpfs mapping: - * pagevec_lookup() might then return 0 prematurely (because it - * got a gangful of swap entries); but it's hardly worth worrying - * about - it can rarely have anything to free from such a mapping - * (most pages are dirty), and already skips over any difficulties. - */ - pagevec_init(&pvec, 0); while (index <= end && pagevec_lookup_entries(&pvec, mapping, index, min(end - index, (pgoff_t)PAGEVEC_SIZE - 1) + 1, |