From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 26 Aug 2010 10:27:25 +0000 (+0100)
Subject: Fix build after c/s 1028
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9bc3c6887f1938159dd4a959a8ea90f88c713d22;p=legacy%2Flinux-2.6.18-xen.git

Fix build after c/s 1028

Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/drivers/xen/blktap2/ring.c b/drivers/xen/blktap2/ring.c
index 0ad78324..9c58ca01 100644
--- a/drivers/xen/blktap2/ring.c
+++ b/drivers/xen/blktap2/ring.c
@@ -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;