Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7762741e3af69720186802e945229b6a5afd5c49

Authored by Wu Fengguang
1 parent 00821b002d
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

writeback: consolidate variable names in balance_dirty_pages() 

Introduce

	nr_dirty = NR_FILE_DIRTY + NR_WRITEBACK + NR_UNSTABLE_NFS

in order to simplify many tests in the following patches.

balance_dirty_pages() will eventually care only about the dirty sums
besides nr_writeback.

Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>

Showing 1 changed file with 11 additions and 10 deletions Side-by-side Diff

... ... @@ -565,8 +565,9 @@
565 565 static void balance_dirty_pages(struct address_space *mapping,
566 566 unsigned long write_chunk)
567 567 {
568   - long nr_reclaimable, bdi_nr_reclaimable;
569   - long nr_writeback, bdi_nr_writeback;
  568 + unsigned long nr_reclaimable, bdi_nr_reclaimable;
  569 + unsigned long nr_dirty; /* = file_dirty + writeback + unstable_nfs */
  570 + unsigned long bdi_dirty;
570 571 unsigned long background_thresh;
571 572 unsigned long dirty_thresh;
572 573 unsigned long bdi_thresh;
... ... @@ -579,7 +580,7 @@
579 580 for (;;) {
580 581 nr_reclaimable = global_page_state(NR_FILE_DIRTY) +
581 582 global_page_state(NR_UNSTABLE_NFS);
582   - nr_writeback = global_page_state(NR_WRITEBACK);
  583 + nr_dirty = nr_reclaimable + global_page_state(NR_WRITEBACK);
583 584  
584 585 global_dirty_limits(&background_thresh, &dirty_thresh);
585 586  
... ... @@ -588,8 +589,7 @@
588 589 * catch-up. This avoids (excessively) small writeouts
589 590 * when the bdi limits are ramping up.
590 591 */
591   - if (nr_reclaimable + nr_writeback <=
592   - (background_thresh + dirty_thresh) / 2)
  592 + if (nr_dirty <= (background_thresh + dirty_thresh) / 2)
593 593 break;
594 594  
595 595 bdi_thresh = bdi_dirty_limit(bdi, dirty_thresh);
596 596  
... ... @@ -607,10 +607,12 @@
607 607 */
608 608 if (bdi_thresh < 2*bdi_stat_error(bdi)) {
609 609 bdi_nr_reclaimable = bdi_stat_sum(bdi, BDI_RECLAIMABLE);
610   - bdi_nr_writeback = bdi_stat_sum(bdi, BDI_WRITEBACK);
  610 + bdi_dirty = bdi_nr_reclaimable +
  611 + bdi_stat_sum(bdi, BDI_WRITEBACK);
611 612 } else {
612 613 bdi_nr_reclaimable = bdi_stat(bdi, BDI_RECLAIMABLE);
613   - bdi_nr_writeback = bdi_stat(bdi, BDI_WRITEBACK);
  614 + bdi_dirty = bdi_nr_reclaimable +
  615 + bdi_stat(bdi, BDI_WRITEBACK);
614 616 }
615 617  
616 618 /*
... ... @@ -619,9 +621,8 @@
619 621 * bdi or process from holding back light ones; The latter is
620 622 * the last resort safeguard.
621 623 */
622   - dirty_exceeded =
623   - (bdi_nr_reclaimable + bdi_nr_writeback > bdi_thresh)
624   - || (nr_reclaimable + nr_writeback > dirty_thresh);
  624 + dirty_exceeded = (bdi_dirty > bdi_thresh) ||
  625 + (nr_dirty > dirty_thresh);
625 626  
626 627 if (!dirty_exceeded)
627 628 break;