X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=mm%2Fpage_io.c;h=9bca17ecc4df1d2e01345f68399f522f89450825;hb=c3a74f8e25e97166ca0f954414825ae98a3209f6;hp=433df1263349589b1f18ecc4ef0220739e4d9330;hpb=20c7775aecea04d8ca322039969d49dcf568e0e9;p=linux-2.6-microblaze.git

diff --git a/mm/page_io.c b/mm/page_io.c
index 433df1263349..9bca17ecc4df 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -291,12 +291,14 @@ static inline void count_swpout_vm_event(struct page *page)
 static void bio_associate_blkg_from_page(struct bio *bio, struct page *page)
 {
 	struct cgroup_subsys_state *css;
+	struct mem_cgroup *memcg;
 
-	if (!page->mem_cgroup)
+	memcg = page_memcg(page);
+	if (!memcg)
 		return;
 
 	rcu_read_lock();
-	css = cgroup_e_css(page->mem_cgroup->css.cgroup, &io_cgrp_subsys);
+	css = cgroup_e_css(memcg->css.cgroup, &io_cgrp_subsys);
 	bio_associate_blkg_from_css(bio, css);
 	rcu_read_unlock();
 }