Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull vfs pile 1 from Al Viro:
 "Unfortunately, this merge window it'll have a be a lot of small piles -
  my fault, actually, for not keeping #for-next in anything that would
  resemble a sane shape ;-/

  This pile: assorted fixes (the first 3 are -stable fodder, IMO) and
  cleanups + %pd/%pD formats (dentry/file pathname, up to 4 last
  components) + several long-standing patches from various folks.

  There definitely will be a lot more (starting with Miklos'
  check_submount_and_drop() series)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits)
  direct-io: Handle O_(D)SYNC AIO
  direct-io: Implement generic deferred AIO completions
  add formats for dentry/file pathnames
  kvm eventfd: switch to fdget
  powerpc kvm: use fdget
  switch fchmod() to fdget
  switch epoll_ctl() to fdget
  switch copy_module_from_fd() to fdget
  git simplify nilfs check for busy subtree
  ibmasmfs: don't bother passing superblock when not needed
  don't pass superblock to hypfs_{mkdir,create*}
  don't pass superblock to hypfs_diag_create_files
  don't pass superblock to hypfs_vm_create_files()
  oprofile: get rid of pointless forward declarations of struct super_block
  oprofilefs_create_...() do not need superblock argument
  oprofilefs_mkdir() doesn't need superblock argument
  don't bother with passing superblock to oprofile_create_stats_files()
  oprofile: don't bother with passing superblock to ->create_files()
  don't bother passing sb to oprofile_create_files()
  coh901318: don't open-code simple_read_from_buffer()
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 1550637d1b10..abe4d6043b36 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -291,7 +291,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
 {
         struct kvm_irq_routing_table *irq_rt;
         struct _irqfd *irqfd, *tmp;
-        struct file *file = NULL;
+        struct fd f;
         struct eventfd_ctx *eventfd = NULL, *resamplefd = NULL;
         int ret;
         unsigned int events;
@@ -306,13 +306,13 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
         INIT_WORK(&irqfd->inject, irqfd_inject);
         INIT_WORK(&irqfd->shutdown, irqfd_shutdown);
 
-        file = eventfd_fget(args->fd);
-        if (IS_ERR(file)) {
-                ret = PTR_ERR(file);
-                goto fail;
+        f = fdget(args->fd);
+        if (!f.file) {
+                ret = -EBADF;
+                goto out;
         }
 
-        eventfd = eventfd_ctx_fileget(file);
+        eventfd = eventfd_ctx_fileget(f.file);
         if (IS_ERR(eventfd)) {
                 ret = PTR_ERR(eventfd);
                 goto fail;
@@ -391,7 +391,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
                                            lockdep_is_held(&kvm->irqfds.lock));
         irqfd_update(kvm, irqfd, irq_rt);
 
-        events = file->f_op->poll(file, &irqfd->pt);
+        events = f.file->f_op->poll(f.file, &irqfd->pt);
 
         list_add_tail(&irqfd->list, &kvm->irqfds.items);
 
@@ -408,7 +408,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
          * do not drop the file until the irqfd is fully initialized, otherwise
          * we might race against the POLLHUP
          */
-        fput(file);
+        fdput(f);
 
         return 0;
 
@@ -422,9 +422,9 @@ fail:
         if (eventfd && !IS_ERR(eventfd))
                 eventfd_ctx_put(eventfd);
 
-        if (!IS_ERR(file))
-                fput(file);
+        fdput(f);
 
+out:
         kfree(irqfd);
         return ret;
 }