From 3c140e05511035604d3f02909a449fc4c90050a5 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 27 Aug 2012 14:21:39 -0400 Subject: [PATCH] --- yaml --- r: 329011 b: refs/heads/master c: cecb46f194460d23cacf3b13593f9f5a4f7a0fed h: refs/heads/master i: 329009: 62d0b5b190407945dd70229aadb6e50bdf785e21 329007: 0023f2c049be0666b78ac6e30b487871010d1f59 v: v3 --- [refs] | 2 +- trunk/drivers/vhost/vhost.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8a54580334a1..3b9e03411179 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e10ce27f0df9eda7b36eb16e553f07a9e05c6bba +refs/heads/master: cecb46f194460d23cacf3b13593f9f5a4f7a0fed diff --git a/trunk/drivers/vhost/vhost.c b/trunk/drivers/vhost/vhost.c index ef82a0d18489..99ac2cb08b43 100644 --- a/trunk/drivers/vhost/vhost.c +++ b/trunk/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;