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
This commit is contained in:
Linus Torvalds
2019-07-19 11:35:08 -07:00
2 changed files with 14 additions and 5 deletions

View File

@@ -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);