Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/include/linux/raid/linear.h b/include/linux/raid/linear.h
index 70afc1d..ba15469 100644 (file)
--- a/include/linux/raid/linear.h
+++ b/include/linux/raid/linear.h
@@ -5,22 +5,19 @@
 
 struct dev_info {
        mdk_rdev_t      *rdev;
-       unsigned long   size;
-       unsigned long   offset;
+       sector_t        size;
+       sector_t        offset;
 };
 
 typedef struct dev_info dev_info_t;
 
-struct linear_hash
-{
-       dev_info_t *dev0, *dev1;
-};
-
 struct linear_private_data
 {
-       struct linear_hash      *hash_table;
-       dev_info_t              *smallest;
-       int                     nr_zones;
+       struct linear_private_data *prev;       /* earlier version */
+       dev_info_t              **hash_table;
+       sector_t                hash_spacing;
+       sector_t                array_size;
+       int                     preshift; /* shift before dividing by hash_spacing */
        dev_info_t              disks[0];
 };