nfsd: per-net NFSd up flag introduced

[firefly-linux-kernel-4.4.55.git] / drivers / vhost / vhost.c

diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index ef82a0d18489365e64a7ab0958bf01f654cfc8b1..99ac2cb08b43bcb3b570969d752bff25126f298d 100644 (file)
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -636,8 +636,8 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
 
 static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
 {
-       struct file *eventfp, *filep = NULL,
-                   *pollstart = NULL, *pollstop = NULL;
+       struct file *eventfp, *filep = NULL;
+       bool pollstart = false, pollstop = false;
        struct eventfd_ctx *ctx = NULL;
        u32 __user *idxp = argp;
        struct vhost_virtqueue *vq;
@@ -763,8 +763,8 @@ static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
                        break;
                }
                if (eventfp != vq->kick) {
-                       pollstop = filep = vq->kick;
-                       pollstart = vq->kick = eventfp;
+                       pollstop = (filep = vq->kick) != NULL;
+                       pollstart = (vq->kick = eventfp) != NULL;
                } else
                        filep = eventfp;
                break;