Merge branch 'bcmring/removal' into next/multiplatform

[~andy/linux] / drivers / md / multipath.h

diff --git a/drivers/md/multipath.h b/drivers/md/multipath.h
index 3c5a45eb5f8a14ef8e8caf372470a73ce0dc7700..717c60f628982ebf659c7aa00bd1608e0fc8ddf0 100644 (file)
--- a/drivers/md/multipath.h
+++ b/drivers/md/multipath.h
@@ -2,11 +2,11 @@
 #define _MULTIPATH_H
 
 struct multipath_info {
-       mdk_rdev_t      *rdev;
+       struct md_rdev  *rdev;
 };
 
-struct multipath_private_data {
-       mddev_t                 *mddev;
+struct mpconf {
+       struct mddev                    *mddev;
        struct multipath_info   *multipaths;
        int                     raid_disks;
        spinlock_t              device_lock;
@@ -15,8 +15,6 @@ struct multipath_private_data {
        mempool_t               *pool;
 };
 
-typedef struct multipath_private_data multipath_conf_t;
-
 /*
  * this is our 'private' 'collective' MULTIPATH buffer head.
  * it contains information about what kind of IO operations were started
@@ -24,7 +22,7 @@ typedef struct multipath_private_data multipath_conf_t;
  */
 
 struct multipath_bh {
-       mddev_t                 *mddev;
+       struct mddev                    *mddev;
        struct bio              *master_bio;
        struct bio              bio;
        int                     path;