Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[cascardo/linux.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 90002ea..35ef28a 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -145,14 +145,10 @@ static int hwpoison_filter_task(struct page *p)
                return -EINVAL;
 
        css = mem_cgroup_css(mem);
-       /* root_mem_cgroup has NULL dentries */
-       if (!css->cgroup->dentry)
-               return -EINVAL;
-
-       ino = css->cgroup->dentry->d_inode->i_ino;
+       ino = cgroup_ino(css->cgroup);
        css_put(css);
 
-       if (ino != hwpoison_filter_memcg)
+       if (!ino || ino != hwpoison_filter_memcg)
                return -EINVAL;
 
        return 0;