md/raid1: add takeover support for raid5->raid1

[safe/jmp/linux-2.6] / drivers / md / raid0.h

diff --git a/drivers/md/raid0.h b/drivers/md/raid0.h
index fd42aa8..91f8e87 100644 (file)
--- a/drivers/md/raid0.h
+++ b/drivers/md/raid0.h
@@ -1,30 +1,20 @@
 #ifndef _RAID0_H
 #define _RAID0_H
 
-#include <linux/raid/md.h>
-
 struct strip_zone
 {
-       sector_t zone_start;    /* Zone offset in md_dev (in sectors) */
+       sector_t zone_end;      /* Start of the next zone (in sectors) */
        sector_t dev_start;     /* Zone offset in real dev (in sectors) */
-       sector_t sectors;       /* Zone size in sectors */
        int nb_dev;             /* # of devices attached to the zone */
-       mdk_rdev_t **dev;       /* Devices attached to the zone */
 };
 
 struct raid0_private_data
 {
-       struct strip_zone **hash_table; /* Table of indexes into strip_zone */
        struct strip_zone *strip_zone;
        mdk_rdev_t **devlist; /* lists of rdevs, pointed to by strip_zone->dev */
        int nr_strip_zones;
-
-       sector_t spacing;
-       int sector_shift; /* shift this before divide by spacing */
 };
 
 typedef struct raid0_private_data raid0_conf_t;
 
-#define mddev_to_conf(mddev) ((raid0_conf_t *) mddev->private)
-
 #endif