aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/xen-blkback/common.h
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-05-11 15:57:09 -0400
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-05-11 15:57:09 -0400
commit01f37f2d53e14a05b7fc3601d182f31ac3b35847 (patch)
treeb12e0eb77888710865ad577f3735a550f57a7242 /drivers/block/xen-blkback/common.h
parent3d68b39926b3b247d76cc4da0256e979b2b730e3 (diff)
xen/blkback: Fixed up comments and converted spaces to tabs.
Suggested-by: Ian Campbell <Ian.Campbell@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/block/xen-blkback/common.h')
-rw-r--r--drivers/block/xen-blkback/common.h77
1 files changed, 41 insertions, 36 deletions
diff --git a/drivers/block/xen-blkback/common.h b/drivers/block/xen-blkback/common.h
index af93837e1295..e37dcf7f6b8e 100644
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
@@ -47,53 +47,58 @@
47 __FILE__ , __LINE__ , ## _a) 47 __FILE__ , __LINE__ , ## _a)
48 48
49struct vbd { 49struct vbd {
50 blkif_vdev_t handle; /* what the domain refers to this vbd as */ 50 /* What the domain refers to this vbd as. */
51 unsigned char readonly; /* Non-zero -> read-only */ 51 blkif_vdev_t handle;
52 unsigned char type; /* VDISK_xxx */ 52 /* Non-zero -> read-only */
53 u32 pdevice; /* phys device that this vbd maps to */ 53 unsigned char readonly;
54 struct block_device *bdev; 54 /* VDISK_xxx */
55 sector_t size; /* Cached size parameter */ 55 unsigned char type;
56 bool flush_support; 56 /* phys device that this vbd maps to. */
57 u32 pdevice;
58 struct block_device *bdev;
59 /* Cached size parameter. */
60 sector_t size;
61 bool flush_support;
57}; 62};
58 63
59struct backend_info; 64struct backend_info;
60 65
61struct blkif_st { 66struct blkif_st {
62 /* Unique identifier for this interface. */ 67 /* Unique identifier for this interface. */
63 domid_t domid; 68 domid_t domid;
64 unsigned int handle; 69 unsigned int handle;
65 /* Physical parameters of the comms window. */ 70 /* Physical parameters of the comms window. */
66 unsigned int irq; 71 unsigned int irq;
67 /* Comms information. */ 72 /* Comms information. */
68 enum blkif_protocol blk_protocol; 73 enum blkif_protocol blk_protocol;
69 union blkif_back_rings blk_rings; 74 union blkif_back_rings blk_rings;
70 struct vm_struct *blk_ring_area; 75 struct vm_struct *blk_ring_area;
71 /* The VBD attached to this interface. */ 76 /* The VBD attached to this interface. */
72 struct vbd vbd; 77 struct vbd vbd;
73 /* Back pointer to the backend_info. */ 78 /* Back pointer to the backend_info. */
74 struct backend_info *be; 79 struct backend_info *be;
75 /* Private fields. */ 80 /* Private fields. */
76 spinlock_t blk_ring_lock; 81 spinlock_t blk_ring_lock;
77 atomic_t refcnt; 82 atomic_t refcnt;
78 83
79 wait_queue_head_t wq; 84 wait_queue_head_t wq;
80 /* One thread per one blkif. */ 85 /* One thread per one blkif. */
81 struct task_struct *xenblkd; 86 struct task_struct *xenblkd;
82 unsigned int waiting_reqs; 87 unsigned int waiting_reqs;
83 88
84 /* statistics */ 89 /* statistics */
85 unsigned long st_print; 90 unsigned long st_print;
86 int st_rd_req; 91 int st_rd_req;
87 int st_wr_req; 92 int st_wr_req;
88 int st_oo_req; 93 int st_oo_req;
89 int st_f_req; 94 int st_f_req;
90 int st_rd_sect; 95 int st_rd_sect;
91 int st_wr_sect; 96 int st_wr_sect;
92 97
93 wait_queue_head_t waiting_to_free; 98 wait_queue_head_t waiting_to_free;
94 99
95 grant_handle_t shmem_handle; 100 grant_handle_t shmem_handle;
96 grant_ref_t shmem_ref; 101 grant_ref_t shmem_ref;
97}; 102};
98 103
99 104
@@ -109,10 +114,10 @@ struct blkif_st {
109 } while (0) 114 } while (0)
110 115
111struct phys_req { 116struct phys_req {
112 unsigned short dev; 117 unsigned short dev;
113 unsigned short nr_sects; 118 unsigned short nr_sects;
114 struct block_device *bdev; 119 struct block_device *bdev;
115 blkif_sector_t sector_number; 120 blkif_sector_t sector_number;
116}; 121};
117int xen_blkif_interface_init(void); 122int xen_blkif_interface_init(void);
118 123