diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-10-31 01:22:04 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-19 13:01:25 -0500 |
| commit | b583043e99bc6d91e98fae32bd9eff6a5958240a (patch) | |
| tree | 8f2f9a4d28ae16c7d452808ff400bb1f31fb09c8 /kernel | |
| parent | 30e46aba8f1010b03178f04c0c56be299c063df2 (diff) | |
kill f_dentry uses
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/auditsc.c | 2 | ||||
| -rw-r--r-- | kernel/events/core.c | 2 | ||||
| -rw-r--r-- | kernel/taskstats.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index e420a0c41b5f..06820657c8ca 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
| @@ -2373,7 +2373,7 @@ int __audit_log_bprm_fcaps(struct linux_binprm *bprm, | |||
| 2373 | ax->d.next = context->aux; | 2373 | ax->d.next = context->aux; |
| 2374 | context->aux = (void *)ax; | 2374 | context->aux = (void *)ax; |
| 2375 | 2375 | ||
| 2376 | dentry = dget(bprm->file->f_dentry); | 2376 | dentry = dget(bprm->file->f_path.dentry); |
| 2377 | get_vfs_caps_from_disk(dentry, &vcaps); | 2377 | get_vfs_caps_from_disk(dentry, &vcaps); |
| 2378 | dput(dentry); | 2378 | dput(dentry); |
| 2379 | 2379 | ||
diff --git a/kernel/events/core.c b/kernel/events/core.c index 1425d07018de..446fbeefad1c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
| @@ -614,7 +614,7 @@ static inline int perf_cgroup_connect(int fd, struct perf_event *event, | |||
| 614 | if (!f.file) | 614 | if (!f.file) |
| 615 | return -EBADF; | 615 | return -EBADF; |
| 616 | 616 | ||
| 617 | css = css_tryget_online_from_dir(f.file->f_dentry, | 617 | css = css_tryget_online_from_dir(f.file->f_path.dentry, |
| 618 | &perf_event_cgrp_subsys); | 618 | &perf_event_cgrp_subsys); |
| 619 | if (IS_ERR(css)) { | 619 | if (IS_ERR(css)) { |
| 620 | ret = PTR_ERR(css); | 620 | ret = PTR_ERR(css); |
diff --git a/kernel/taskstats.c b/kernel/taskstats.c index b312fcc73024..670fff88a961 100644 --- a/kernel/taskstats.c +++ b/kernel/taskstats.c | |||
| @@ -459,7 +459,7 @@ static int cgroupstats_user_cmd(struct sk_buff *skb, struct genl_info *info) | |||
| 459 | stats = nla_data(na); | 459 | stats = nla_data(na); |
| 460 | memset(stats, 0, sizeof(*stats)); | 460 | memset(stats, 0, sizeof(*stats)); |
| 461 | 461 | ||
| 462 | rc = cgroupstats_build(stats, f.file->f_dentry); | 462 | rc = cgroupstats_build(stats, f.file->f_path.dentry); |
| 463 | if (rc < 0) { | 463 | if (rc < 0) { |
| 464 | nlmsg_free(rep_skb); | 464 | nlmsg_free(rep_skb); |
| 465 | goto err; | 465 | goto err; |
