Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / xen / blkback / common.h

diff --git a/drivers/xen/blkback/common.h b/drivers/xen/blkback/common.h
index 29bdd42..d057f79 100644 (file)
--- a/drivers/xen/blkback/common.h
+++ b/drivers/xen/blkback/common.h
@@ -27,6 +27,7 @@
 #ifndef __BLKIF__BACKEND__COMMON_H__
 #define __BLKIF__BACKEND__COMMON_H__
 
 #ifndef __BLKIF__BACKEND__COMMON_H__
 #define __BLKIF__BACKEND__COMMON_H__
 

+#include <linux/config.h>

 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>


@@ -54,9 +55,9 @@ struct vbd {
        unsigned char  type;        /* VDISK_xxx */
        u32            pdevice;     /* phys device that this vbd maps to */
        struct block_device *bdev;
        unsigned char  type;        /* VDISK_xxx */
        u32            pdevice;     /* phys device that this vbd maps to */
        struct block_device *bdev;

-};
+}; 

 
 

-struct backend_info;
+struct backend_info; 

 
 typedef struct blkif_st {
        /* Unique identifier for this interface. */
 
 typedef struct blkif_st {
        /* Unique identifier for this interface. */


@@ -71,7 +72,7 @@ typedef struct blkif_st {
        /* The VBD attached to this interface. */
        struct vbd        vbd;
        /* Back pointer to the backend_info. */
        /* The VBD attached to this interface. */
        struct vbd        vbd;
        /* Back pointer to the backend_info. */

-       struct backend_info *be;
+       struct backend_info *be; 

        /* Private fields. */
        spinlock_t       blk_ring_lock;
        atomic_t         refcnt;
        /* Private fields. */
        spinlock_t       blk_ring_lock;
        atomic_t         refcnt;


@@ -121,7 +122,7 @@ struct phys_req {
        blkif_sector_t       sector_number;
 };
 
        blkif_sector_t       sector_number;
 };
 

-int vbd_translate(struct phys_req *req, blkif_t *blkif, int operation);
+int vbd_translate(struct phys_req *req, blkif_t *blkif, int operation); 

 
 void blkif_interface_init(void);
 
 
 void blkif_interface_init(void);