Commit e0136c16 authored by Zhu Lingshan's avatar Zhu Lingshan Committed by Michael S. Tsirkin

vhost: replace -1 with VHOST_FILE_UNBIND in ioctls

This commit replaces -1 with VHOST_FILE_UNBIND in ioctls since
we have added such a macro in the uapi header for vdpa_host.
Signed-off-by: default avatarZhu Lingshan <lingshan.zhu@intel.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/1591352835-22441-5-git-send-email-lingshan.zhu@intel.comSigned-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 776f3950
...@@ -1612,7 +1612,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg ...@@ -1612,7 +1612,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg
r = -EFAULT; r = -EFAULT;
break; break;
} }
eventfp = f.fd == -1 ? NULL : eventfd_fget(f.fd); eventfp = f.fd == VHOST_FILE_UNBIND ? NULL : eventfd_fget(f.fd);
if (IS_ERR(eventfp)) { if (IS_ERR(eventfp)) {
r = PTR_ERR(eventfp); r = PTR_ERR(eventfp);
break; break;
...@@ -1628,7 +1628,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg ...@@ -1628,7 +1628,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg
r = -EFAULT; r = -EFAULT;
break; break;
} }
ctx = f.fd == -1 ? NULL : eventfd_ctx_fdget(f.fd); ctx = f.fd == VHOST_FILE_UNBIND ? NULL : eventfd_ctx_fdget(f.fd);
if (IS_ERR(ctx)) { if (IS_ERR(ctx)) {
r = PTR_ERR(ctx); r = PTR_ERR(ctx);
break; break;
...@@ -1640,7 +1640,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg ...@@ -1640,7 +1640,7 @@ long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *arg
r = -EFAULT; r = -EFAULT;
break; break;
} }
ctx = f.fd == -1 ? NULL : eventfd_ctx_fdget(f.fd); ctx = f.fd == VHOST_FILE_UNBIND ? NULL : eventfd_ctx_fdget(f.fd);
if (IS_ERR(ctx)) { if (IS_ERR(ctx)) {
r = PTR_ERR(ctx); r = PTR_ERR(ctx);
break; break;
...@@ -1765,7 +1765,7 @@ long vhost_dev_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp) ...@@ -1765,7 +1765,7 @@ long vhost_dev_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
r = get_user(fd, (int __user *)argp); r = get_user(fd, (int __user *)argp);
if (r < 0) if (r < 0)
break; break;
ctx = fd == -1 ? NULL : eventfd_ctx_fdget(fd); ctx = fd == VHOST_FILE_UNBIND ? NULL : eventfd_ctx_fdget(fd);
if (IS_ERR(ctx)) { if (IS_ERR(ctx)) {
r = PTR_ERR(ctx); r = PTR_ERR(ctx);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment