WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 07/10] blktap: Avoid some header quirks.

To: Xen <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH 07/10] blktap: Avoid some header quirks.
From: Daniel Stodden <daniel.stodden@xxxxxxxxxx>
Date: Tue, 8 Mar 2011 16:42:54 -0800
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>, Daniel Stodden <daniel.stodden@xxxxxxxxxx>
Delivery-date: Tue, 08 Mar 2011 16:50:22 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <1299631377-7853-1-git-send-email-daniel.stodden@xxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <1299631377-7853-1-git-send-email-daniel.stodden@xxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
- Include linux/slab.h where needed.
- Avoid the ring typedefs, use struct blktap_x instead.

Signed-off-by: Daniel Stodden <daniel.stodden@xxxxxxxxxx>
---
 drivers/block/blktap/blktap.h  |    2 +-
 drivers/block/blktap/control.c |    1 +
 drivers/block/blktap/request.c |    1 +
 drivers/block/blktap/ring.c    |    2 +-
 drivers/block/blktap/sysfs.c   |    2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/block/blktap/blktap.h b/drivers/block/blktap/blktap.h
index 05cfd1f..e0f7d99 100644
--- a/drivers/block/blktap/blktap.h
+++ b/drivers/block/blktap/blktap.h
@@ -44,7 +44,7 @@ struct blktap_ring {
        struct task_struct            *task;
 
        struct vm_area_struct         *vma;
-       blktap_front_ring_t            ring;
+       struct blktap_front_ring       ring;
        unsigned long                  ring_vstart;
        unsigned long                  user_vstart;
 
diff --git a/drivers/block/blktap/control.c b/drivers/block/blktap/control.c
index 57b1a10..9294a13 100644
--- a/drivers/block/blktap/control.c
+++ b/drivers/block/blktap/control.c
@@ -2,6 +2,7 @@
 #include <linux/sched.h>
 #include <linux/miscdevice.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 
 #include "blktap.h"
diff --git a/drivers/block/blktap/request.c b/drivers/block/blktap/request.c
index 8cfd6c9..e799d08 100644
--- a/drivers/block/blktap/request.c
+++ b/drivers/block/blktap/request.c
@@ -3,6 +3,7 @@
 #include <linux/mutex.h>
 #include <linux/sched.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 
 #include "blktap.h"
 
diff --git a/drivers/block/blktap/ring.c b/drivers/block/blktap/ring.c
index e667d2d..134583d 100644
--- a/drivers/block/blktap/ring.c
+++ b/drivers/block/blktap/ring.c
@@ -352,7 +352,7 @@ blktap_ring_mmap(struct file *filp, struct vm_area_struct 
*vma)
 {
        struct blktap *tap = filp->private_data;
        struct blktap_ring *ring = &tap->ring;
-       blktap_sring_t *sring;
+       struct blktap_sring *sring;
        struct page *page = NULL;
        int err;
 
diff --git a/drivers/block/blktap/sysfs.c b/drivers/block/blktap/sysfs.c
index 182de9a..97ebc53 100644
--- a/drivers/block/blktap/sysfs.c
+++ b/drivers/block/blktap/sysfs.c
@@ -75,7 +75,7 @@ blktap_sysfs_remove_device(struct device *dev,
                goto wait;
 
        if (tap->ring.vma) {
-               blktap_sring_t *sring = tap->ring.ring.sring;
+               struct blktap_sring *sring = tap->ring.ring.sring;
                sring->private.tapif_user.msg = BLKTAP_RING_MESSAGE_CLOSE;
                blktap_ring_kick_user(tap);
        } else {
-- 
1.7.0.4


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

<Prev in Thread] Current Thread [Next in Thread>