]> xenbits.xensource.com Git - legacy/linux-2.6.18-xen.git/commitdiff
Fix build after c/s 1028
authorKeir Fraser <keir.fraser@citrix.com>
Thu, 26 Aug 2010 10:27:25 +0000 (11:27 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Thu, 26 Aug 2010 10:27:25 +0000 (11:27 +0100)
Signed-off-by: Jan Beulich <jbeulich@novell.com>
drivers/xen/blktap2/ring.c

index 0ad7832487bf510c075b05094f11c8f2d651792e..9c58ca01b53a6bfb2553591b04dafc93ecf64326 100644 (file)
@@ -360,7 +360,7 @@ blktap_ring_set_message(struct blktap *tap, int msg)
 
        down_read(&tap->tap_sem);
        if (ring->ring.sring)
-               ring->ring.sring->pad[0] = msg;
+               ring->ring.sring->private.tapif_user.msg = msg;
        up_read(&tap->tap_sem);
 }
 
@@ -470,7 +470,7 @@ static unsigned int blktap_ring_poll(struct file *filp, poll_table *wait)
        struct blktap_ring *ring = &tap->ring;
 
        poll_wait(filp, &ring->poll_wait, wait);
-       if (ring->ring.sring->pad[0] != 0 ||
+       if (ring->ring.sring->private.tapif_user.msg ||
            ring->ring.req_prod_pvt != ring->ring.sring->req_prod) {
                RING_PUSH_REQUESTS(&ring->ring);
                return POLLIN | POLLRDNORM;