diff options
Diffstat (limited to 'mm/truncate.c')
-rw-r--r-- | mm/truncate.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mm/truncate.c b/mm/truncate.c index eda247307164..96d167372d89 100644 --- a/mm/truncate.c +++ b/mm/truncate.c | |||
@@ -281,7 +281,6 @@ void truncate_inode_pages_range(struct address_space *mapping, | |||
281 | while (index < end && pagevec_lookup_entries(&pvec, mapping, index, | 281 | while (index < end && pagevec_lookup_entries(&pvec, mapping, index, |
282 | min(end - index, (pgoff_t)PAGEVEC_SIZE), | 282 | min(end - index, (pgoff_t)PAGEVEC_SIZE), |
283 | indices)) { | 283 | indices)) { |
284 | mem_cgroup_uncharge_start(); | ||
285 | for (i = 0; i < pagevec_count(&pvec); i++) { | 284 | for (i = 0; i < pagevec_count(&pvec); i++) { |
286 | struct page *page = pvec.pages[i]; | 285 | struct page *page = pvec.pages[i]; |
287 | 286 | ||
@@ -307,7 +306,6 @@ void truncate_inode_pages_range(struct address_space *mapping, | |||
307 | } | 306 | } |
308 | pagevec_remove_exceptionals(&pvec); | 307 | pagevec_remove_exceptionals(&pvec); |
309 | pagevec_release(&pvec); | 308 | pagevec_release(&pvec); |
310 | mem_cgroup_uncharge_end(); | ||
311 | cond_resched(); | 309 | cond_resched(); |
312 | index++; | 310 | index++; |
313 | } | 311 | } |
@@ -369,7 +367,6 @@ void truncate_inode_pages_range(struct address_space *mapping, | |||
369 | pagevec_release(&pvec); | 367 | pagevec_release(&pvec); |
370 | break; | 368 | break; |
371 | } | 369 | } |
372 | mem_cgroup_uncharge_start(); | ||
373 | for (i = 0; i < pagevec_count(&pvec); i++) { | 370 | for (i = 0; i < pagevec_count(&pvec); i++) { |
374 | struct page *page = pvec.pages[i]; | 371 | struct page *page = pvec.pages[i]; |
375 | 372 | ||
@@ -394,7 +391,6 @@ void truncate_inode_pages_range(struct address_space *mapping, | |||
394 | } | 391 | } |
395 | pagevec_remove_exceptionals(&pvec); | 392 | pagevec_remove_exceptionals(&pvec); |
396 | pagevec_release(&pvec); | 393 | pagevec_release(&pvec); |
397 | mem_cgroup_uncharge_end(); | ||
398 | index++; | 394 | index++; |
399 | } | 395 | } |
400 | cleancache_invalidate_inode(mapping); | 396 | cleancache_invalidate_inode(mapping); |
@@ -493,7 +489,6 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping, | |||
493 | while (index <= end && pagevec_lookup_entries(&pvec, mapping, index, | 489 | while (index <= end && pagevec_lookup_entries(&pvec, mapping, index, |
494 | min(end - index, (pgoff_t)PAGEVEC_SIZE - 1) + 1, | 490 | min(end - index, (pgoff_t)PAGEVEC_SIZE - 1) + 1, |
495 | indices)) { | 491 | indices)) { |
496 | mem_cgroup_uncharge_start(); | ||
497 | for (i = 0; i < pagevec_count(&pvec); i++) { | 492 | for (i = 0; i < pagevec_count(&pvec); i++) { |
498 | struct page *page = pvec.pages[i]; | 493 | struct page *page = pvec.pages[i]; |
499 | 494 | ||
@@ -522,7 +517,6 @@ unsigned long invalidate_mapping_pages(struct address_space *mapping, | |||
522 | } | 517 | } |
523 | pagevec_remove_exceptionals(&pvec); | 518 | pagevec_remove_exceptionals(&pvec); |
524 | pagevec_release(&pvec); | 519 | pagevec_release(&pvec); |
525 | mem_cgroup_uncharge_end(); | ||
526 | cond_resched(); | 520 | cond_resched(); |
527 | index++; | 521 | index++; |
528 | } | 522 | } |
@@ -553,7 +547,6 @@ invalidate_complete_page2(struct address_space *mapping, struct page *page) | |||
553 | BUG_ON(page_has_private(page)); | 547 | BUG_ON(page_has_private(page)); |
554 | __delete_from_page_cache(page, NULL); | 548 | __delete_from_page_cache(page, NULL); |
555 | spin_unlock_irq(&mapping->tree_lock); | 549 | spin_unlock_irq(&mapping->tree_lock); |
556 | mem_cgroup_uncharge_cache_page(page); | ||
557 | 550 | ||
558 | if (mapping->a_ops->freepage) | 551 | if (mapping->a_ops->freepage) |
559 | mapping->a_ops->freepage(page); | 552 | mapping->a_ops->freepage(page); |
@@ -602,7 +595,6 @@ int invalidate_inode_pages2_range(struct address_space *mapping, | |||
602 | while (index <= end && pagevec_lookup_entries(&pvec, mapping, index, | 595 | while (index <= end && pagevec_lookup_entries(&pvec, mapping, index, |
603 | min(end - index, (pgoff_t)PAGEVEC_SIZE - 1) + 1, | 596 | min(end - index, (pgoff_t)PAGEVEC_SIZE - 1) + 1, |
604 | indices)) { | 597 | indices)) { |
605 | mem_cgroup_uncharge_start(); | ||
606 | for (i = 0; i < pagevec_count(&pvec); i++) { | 598 | for (i = 0; i < pagevec_count(&pvec); i++) { |
607 | struct page *page = pvec.pages[i]; | 599 | struct page *page = pvec.pages[i]; |
608 | 600 | ||
@@ -655,7 +647,6 @@ int invalidate_inode_pages2_range(struct address_space *mapping, | |||
655 | } | 647 | } |
656 | pagevec_remove_exceptionals(&pvec); | 648 | pagevec_remove_exceptionals(&pvec); |
657 | pagevec_release(&pvec); | 649 | pagevec_release(&pvec); |
658 | mem_cgroup_uncharge_end(); | ||
659 | cond_resched(); | 650 | cond_resched(); |
660 | index++; | 651 | index++; |
661 | } | 652 | } |