[PATCH] linux: fix build after c/s 1028

[PATCH] linux: fix build after c/s 1028

[Jan Beulich]

[-- Attachment #1: Type: text/plain, Size: 742 bytes --]

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

--- a/drivers/xen/blktap2/ring.c
+++ b/drivers/xen/blktap2/ring.c
@@ -360,7 +360,7 @@ blktap_ring_set_message(struct blktap *t
 
 	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(str
 	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;




[-- Attachment #2: xen-fix-1028.patch --]
[-- Type: text/plain, Size: 780 bytes --]

Subject: linux: fix build after c/s 1028

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

--- a/drivers/xen/blktap2/ring.c
+++ b/drivers/xen/blktap2/ring.c
@@ -360,7 +360,7 @@ blktap_ring_set_message(struct blktap *t
 
 	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(str
 	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;

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel