diff options
author | Namjae Jeon <linkinjeon@gmail.com> | 2012-12-11 19:00:21 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 20:22:21 -0500 |
commit | d0e1d66b5aa1ec9f556f951aa9a114cc192cd01c (patch) | |
tree | 3c3d9d8a1575a5fff0233d70951ed7d94c9a1e7e /mm/page-writeback.c | |
parent | b58ed041a360ed051fab17e4d9b0f451c6fedba7 (diff) |
writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
There is no reason to pass the nr_pages_dirtied argument, because
nr_pages_dirtied value from the caller is unused in
balance_dirty_pages_ratelimited_nr().
Signed-off-by: Namjae Jeon <linkinjeon@gmail.com>
Signed-off-by: Vivek Trivedi <vtrivedi018@gmail.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page-writeback.c')
-rw-r--r-- | mm/page-writeback.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 830893b2b3c7..6f4271224493 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
@@ -1069,7 +1069,7 @@ static void bdi_update_bandwidth(struct backing_dev_info *bdi, | |||
1069 | } | 1069 | } |
1070 | 1070 | ||
1071 | /* | 1071 | /* |
1072 | * After a task dirtied this many pages, balance_dirty_pages_ratelimited_nr() | 1072 | * After a task dirtied this many pages, balance_dirty_pages_ratelimited() |
1073 | * will look to see if it needs to start dirty throttling. | 1073 | * will look to see if it needs to start dirty throttling. |
1074 | * | 1074 | * |
1075 | * If dirty_poll_interval is too low, big NUMA machines will call the expensive | 1075 | * If dirty_poll_interval is too low, big NUMA machines will call the expensive |
@@ -1436,9 +1436,8 @@ static DEFINE_PER_CPU(int, bdp_ratelimits); | |||
1436 | DEFINE_PER_CPU(int, dirty_throttle_leaks) = 0; | 1436 | DEFINE_PER_CPU(int, dirty_throttle_leaks) = 0; |
1437 | 1437 | ||
1438 | /** | 1438 | /** |
1439 | * balance_dirty_pages_ratelimited_nr - balance dirty memory state | 1439 | * balance_dirty_pages_ratelimited - balance dirty memory state |
1440 | * @mapping: address_space which was dirtied | 1440 | * @mapping: address_space which was dirtied |
1441 | * @nr_pages_dirtied: number of pages which the caller has just dirtied | ||
1442 | * | 1441 | * |
1443 | * Processes which are dirtying memory should call in here once for each page | 1442 | * Processes which are dirtying memory should call in here once for each page |
1444 | * which was newly dirtied. The function will periodically check the system's | 1443 | * which was newly dirtied. The function will periodically check the system's |
@@ -1449,8 +1448,7 @@ DEFINE_PER_CPU(int, dirty_throttle_leaks) = 0; | |||
1449 | * limit we decrease the ratelimiting by a lot, to prevent individual processes | 1448 | * limit we decrease the ratelimiting by a lot, to prevent individual processes |
1450 | * from overshooting the limit by (ratelimit_pages) each. | 1449 | * from overshooting the limit by (ratelimit_pages) each. |
1451 | */ | 1450 | */ |
1452 | void balance_dirty_pages_ratelimited_nr(struct address_space *mapping, | 1451 | void balance_dirty_pages_ratelimited(struct address_space *mapping) |
1453 | unsigned long nr_pages_dirtied) | ||
1454 | { | 1452 | { |
1455 | struct backing_dev_info *bdi = mapping->backing_dev_info; | 1453 | struct backing_dev_info *bdi = mapping->backing_dev_info; |
1456 | int ratelimit; | 1454 | int ratelimit; |
@@ -1484,6 +1482,7 @@ void balance_dirty_pages_ratelimited_nr(struct address_space *mapping, | |||
1484 | */ | 1482 | */ |
1485 | p = &__get_cpu_var(dirty_throttle_leaks); | 1483 | p = &__get_cpu_var(dirty_throttle_leaks); |
1486 | if (*p > 0 && current->nr_dirtied < ratelimit) { | 1484 | if (*p > 0 && current->nr_dirtied < ratelimit) { |
1485 | unsigned long nr_pages_dirtied; | ||
1487 | nr_pages_dirtied = min(*p, ratelimit - current->nr_dirtied); | 1486 | nr_pages_dirtied = min(*p, ratelimit - current->nr_dirtied); |
1488 | *p -= nr_pages_dirtied; | 1487 | *p -= nr_pages_dirtied; |
1489 | current->nr_dirtied += nr_pages_dirtied; | 1488 | current->nr_dirtied += nr_pages_dirtied; |
@@ -1493,7 +1492,7 @@ void balance_dirty_pages_ratelimited_nr(struct address_space *mapping, | |||
1493 | if (unlikely(current->nr_dirtied >= ratelimit)) | 1492 | if (unlikely(current->nr_dirtied >= ratelimit)) |
1494 | balance_dirty_pages(mapping, current->nr_dirtied); | 1493 | balance_dirty_pages(mapping, current->nr_dirtied); |
1495 | } | 1494 | } |
1496 | EXPORT_SYMBOL(balance_dirty_pages_ratelimited_nr); | 1495 | EXPORT_SYMBOL(balance_dirty_pages_ratelimited); |
1497 | 1496 | ||
1498 | void throttle_vm_writeout(gfp_t gfp_mask) | 1497 | void throttle_vm_writeout(gfp_t gfp_mask) |
1499 | { | 1498 | { |