Merge branch 'for-linus' of git://neil.brown.name/md

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

diff --git a/drivers/md/linear.h b/drivers/md/linear.h
index 721a878..0ce29b6 100644 (file)
--- a/drivers/md/linear.h
+++ b/drivers/md/linear.h
@@ -3,17 +3,16 @@
 
 struct dev_info {
        mdk_rdev_t      *rdev;
-       sector_t        num_sectors;
-       sector_t        start_sector;
+       sector_t        end_sector;
 };
 
 typedef struct dev_info dev_info_t;
 
 struct linear_private_data
 {
-       struct linear_private_data *prev;       /* earlier version */
        sector_t                array_sectors;
        dev_info_t              disks[0];
+       struct rcu_head         rcu;
 };