|
@@ -253,6 +253,8 @@ unsigned long shrink_slab(struct shrink_control *shrink,
|
|
int shrink_ret = 0;
|
|
int shrink_ret = 0;
|
|
long nr;
|
|
long nr;
|
|
long new_nr;
|
|
long new_nr;
|
|
|
|
+ long batch_size = shrinker->batch ? shrinker->batch
|
|
|
|
+ : SHRINK_BATCH;
|
|
|
|
|
|
/*
|
|
/*
|
|
* copy the current shrinker scan count into a local variable
|
|
* copy the current shrinker scan count into a local variable
|
|
@@ -303,19 +305,18 @@ unsigned long shrink_slab(struct shrink_control *shrink,
|
|
nr_pages_scanned, lru_pages,
|
|
nr_pages_scanned, lru_pages,
|
|
max_pass, delta, total_scan);
|
|
max_pass, delta, total_scan);
|
|
|
|
|
|
- while (total_scan >= SHRINK_BATCH) {
|
|
|
|
- long this_scan = SHRINK_BATCH;
|
|
|
|
|
|
+ while (total_scan >= batch_size) {
|
|
int nr_before;
|
|
int nr_before;
|
|
|
|
|
|
nr_before = do_shrinker_shrink(shrinker, shrink, 0);
|
|
nr_before = do_shrinker_shrink(shrinker, shrink, 0);
|
|
shrink_ret = do_shrinker_shrink(shrinker, shrink,
|
|
shrink_ret = do_shrinker_shrink(shrinker, shrink,
|
|
- this_scan);
|
|
|
|
|
|
+ batch_size);
|
|
if (shrink_ret == -1)
|
|
if (shrink_ret == -1)
|
|
break;
|
|
break;
|
|
if (shrink_ret < nr_before)
|
|
if (shrink_ret < nr_before)
|
|
ret += nr_before - shrink_ret;
|
|
ret += nr_before - shrink_ret;
|
|
- count_vm_events(SLABS_SCANNED, this_scan);
|
|
|
|
- total_scan -= this_scan;
|
|
|
|
|
|
+ count_vm_events(SLABS_SCANNED, batch_size);
|
|
|
|
+ total_scan -= batch_size;
|
|
|
|
|
|
cond_resched();
|
|
cond_resched();
|
|
}
|
|
}
|