Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / linux / raid / linear.h

diff --git a/include/linux/raid/linear.h b/include/linux/raid/linear.h
index 7e375111d0074b390136c56cdca76a1ce6bb5d3c..f38b9c586afbc38c2a3187ac479735b14ad5fffb 100644 (file)
--- a/include/linux/raid/linear.h
+++ b/include/linux/raid/linear.h
@@ -5,8 +5,8 @@
 
 struct dev_info {
        mdk_rdev_t      *rdev;
-       sector_t        size;
-       sector_t        offset;
+       sector_t        num_sectors;
+       sector_t        start_sector;
 };
 
 typedef struct dev_info dev_info_t;
@@ -15,9 +15,11 @@ struct linear_private_data
 {
        struct linear_private_data *prev;       /* earlier version */
        dev_info_t              **hash_table;
-       sector_t                hash_spacing;
+       sector_t                spacing;
        sector_t                array_sectors;
-       int                     preshift; /* shift before dividing by hash_spacing */
+       int                     sector_shift;   /* shift before dividing
+                                                * by spacing
+                                                */
        dev_info_t              disks[0];
 };