|
@@ -580,8 +580,8 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,
|
|
|
struct mem_cgroup *memcg, int priority)
|
|
|
{
|
|
|
struct memcg_shrinker_map *map;
|
|
|
- unsigned long freed = 0;
|
|
|
- int ret, i;
|
|
|
+ unsigned long ret, freed = 0;
|
|
|
+ int i;
|
|
|
|
|
|
if (!memcg_kmem_enabled() || !mem_cgroup_online(memcg))
|
|
|
return 0;
|
|
@@ -677,9 +677,8 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid,
|
|
|
struct mem_cgroup *memcg,
|
|
|
int priority)
|
|
|
{
|
|
|
+ unsigned long ret, freed = 0;
|
|
|
struct shrinker *shrinker;
|
|
|
- unsigned long freed = 0;
|
|
|
- int ret;
|
|
|
|
|
|
if (!mem_cgroup_is_root(memcg))
|
|
|
return shrink_slab_memcg(gfp_mask, nid, memcg, priority);
|