summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-10-31 01:22:04 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-11-19 13:01:25 -0500
commitb583043e99bc6d91e98fae32bd9eff6a5958240a (patch)
tree8f2f9a4d28ae16c7d452808ff400bb1f31fb09c8 /mm
parent30e46aba8f1010b03178f04c0c56be299c063df2 (diff)
downloadlinux-stable-b583043e99bc6d91e98fae32bd9eff6a5958240a.tar.gz
linux-stable-b583043e99bc6d91e98fae32bd9eff6a5958240a.tar.bz2
linux-stable-b583043e99bc6d91e98fae32bd9eff6a5958240a.zip
kill f_dentry uses
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 23976fd885fd..8c3385181b16 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5055,7 +5055,7 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of,
*
* DO NOT ADD NEW FILES.
*/
- name = cfile.file->f_dentry->d_name.name;
+ name = cfile.file->f_path.dentry->d_name.name;
if (!strcmp(name, "memory.usage_in_bytes")) {
event->register_event = mem_cgroup_usage_register_event;
@@ -5079,7 +5079,7 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of,
* automatically removed on cgroup destruction but the removal is
* asynchronous, so take an extra ref on @css.
*/
- cfile_css = css_tryget_online_from_dir(cfile.file->f_dentry->d_parent,
+ cfile_css = css_tryget_online_from_dir(cfile.file->f_path.dentry->d_parent,
&memory_cgrp_subsys);
ret = -EINVAL;
if (IS_ERR(cfile_css))