projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Btrfs: add ASSERT for block group's memory leak
[cascardo/linux.git]
/
mm
/
memcontrol.c
diff --git
a/mm/memcontrol.c
b/mm/memcontrol.c
index
75e7440
..
ac8664d
100644
(file)
--- a/
mm/memcontrol.c
+++ b/
mm/memcontrol.c
@@
-4203,7
+4203,7
@@
mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
return &memcg->css;
fail:
mem_cgroup_free(memcg);
return &memcg->css;
fail:
mem_cgroup_free(memcg);
- return
NULL
;
+ return
ERR_PTR(-ENOMEM)
;
}
static int
}
static int
@@
-5544,6
+5544,7
@@
void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
struct mem_cgroup *memcg;
unsigned int nr_pages;
bool compound;
struct mem_cgroup *memcg;
unsigned int nr_pages;
bool compound;
+ unsigned long flags;
VM_BUG_ON_PAGE(!PageLocked(oldpage), oldpage);
VM_BUG_ON_PAGE(!PageLocked(newpage), newpage);
VM_BUG_ON_PAGE(!PageLocked(oldpage), oldpage);
VM_BUG_ON_PAGE(!PageLocked(newpage), newpage);
@@
-5574,10
+5575,10
@@
void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
commit_charge(newpage, memcg, false);
commit_charge(newpage, memcg, false);
- local_irq_
disable(
);
+ local_irq_
save(flags
);
mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages);
memcg_check_events(memcg, newpage);
mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages);
memcg_check_events(memcg, newpage);
- local_irq_
enable(
);
+ local_irq_
restore(flags
);
}
DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
}
DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);