Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / md / raid0.h

diff --git a/drivers/md/raid0.h b/drivers/md/raid0.h
index a14630a25aa47872141cc6186c3bd6f368e79141..91f8e876ee64516949ddad76b374bc657fd1879c 100644 (file)
--- a/drivers/md/raid0.h
+++ b/drivers/md/raid0.h
@@ -5,9 +5,7 @@ struct strip_zone
 {
        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
@@ -15,13 +13,8 @@ struct raid0_private_data
        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