summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-07-19 11:35:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-19 11:35:08 -0700
commit4f5ed1318c0108369a76f4a56242fbeea537abe9 (patch)
treee1092bbcf848124782edc05d931afbec27600357 /kernel
parentd2fbf4b6d585e40f2369675148777abce3abd0e7 (diff)
parent02e5ad973883c36c0868b301b8357d9c455bb91c (diff)
downloadlinux-4f5ed1318c0108369a76f4a56242fbeea537abe9.tar.bz2
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro: "Assorted stuff" * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: perf_event_get(): don't bother with fget_raw() vfs: update d_make_root() description
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/core.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index eea9d52b010c..026a14541a38 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -11618,9 +11618,7 @@ void perf_event_delayed_put(struct task_struct *task)
struct file *perf_event_get(unsigned int fd)
{
- struct file *file;
-
- file = fget_raw(fd);
+ struct file *file = fget(fd);
if (!file)
return ERR_PTR(-EBADF);