aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-08-30 15:04:22 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-09-03 23:04:45 -0400
commit70abadedab73066fae584488640056f83bce5f95 (patch)
treeeda276db0ca4f6b05e601dff1a8dab16c88026f3
parent173c84012a594a9ee18b63673ab760482c37ad78 (diff)
powerpc kvm: use fdget
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/powerpc/kvm/powerpc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 6316ee336e88..aca2e8f2e33f 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -823,39 +823,39 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
823#endif 823#endif
824#ifdef CONFIG_KVM_MPIC 824#ifdef CONFIG_KVM_MPIC
825 case KVM_CAP_IRQ_MPIC: { 825 case KVM_CAP_IRQ_MPIC: {
826 struct file *filp; 826 struct fd f;
827 struct kvm_device *dev; 827 struct kvm_device *dev;
828 828
829 r = -EBADF; 829 r = -EBADF;
830 filp = fget(cap->args[0]); 830 f = fdget(cap->args[0]);
831 if (!filp) 831 if (!f.file)
832 break; 832 break;
833 833
834 r = -EPERM; 834 r = -EPERM;
835 dev = kvm_device_from_filp(filp); 835 dev = kvm_device_from_filp(f.file);
836 if (dev) 836 if (dev)
837 r = kvmppc_mpic_connect_vcpu(dev, vcpu, cap->args[1]); 837 r = kvmppc_mpic_connect_vcpu(dev, vcpu, cap->args[1]);
838 838
839 fput(filp); 839 fdput(f);
840 break; 840 break;
841 } 841 }
842#endif 842#endif
843#ifdef CONFIG_KVM_XICS 843#ifdef CONFIG_KVM_XICS
844 case KVM_CAP_IRQ_XICS: { 844 case KVM_CAP_IRQ_XICS: {
845 struct file *filp; 845 struct fd f;
846 struct kvm_device *dev; 846 struct kvm_device *dev;
847 847
848 r = -EBADF; 848 r = -EBADF;
849 filp = fget(cap->args[0]); 849 f = fdget(cap->args[0]);
850 if (!filp) 850 if (!f.file)
851 break; 851 break;
852 852
853 r = -EPERM; 853 r = -EPERM;
854 dev = kvm_device_from_filp(filp); 854 dev = kvm_device_from_filp(f.file);
855 if (dev) 855 if (dev)
856 r = kvmppc_xics_connect_vcpu(dev, vcpu, cap->args[1]); 856 r = kvmppc_xics_connect_vcpu(dev, vcpu, cap->args[1]);
857 857
858 fput(filp); 858 fdput(f);
859 break; 859 break;
860 } 860 }
861#endif /* CONFIG_KVM_XICS */ 861#endif /* CONFIG_KVM_XICS */