dm table: fail dm_table_create on dm_round_up overflow

[pandora-kernel.git] / drivers / md / raid10.h

diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h
index be7f8d9..7facfdf 100644 (file)
--- a/drivers/md/raid10.h
+++ b/drivers/md/raid10.h
@@ -1,8 +1,6 @@
 #ifndef _RAID10_H
 #define _RAID10_H
 
-typedef struct mirror_info mirror_info_t;
-
 struct mirror_info {
        struct md_rdev  *rdev;
        sector_t        head_position;
@@ -13,9 +11,9 @@ struct mirror_info {
                                                 */
 };
 
-struct r10_private_data_s {
+struct r10conf {
        struct mddev            *mddev;
-       mirror_info_t           *mirrors;
+       struct mirror_info      *mirrors;
        int                     raid_disks;
        spinlock_t              device_lock;
 
@@ -44,7 +42,7 @@ struct r10_private_data_s {
        struct list_head        retry_list;
        /* queue pending writes and submit them on unplug */
        struct bio_list         pending_bio_list;
-
+       int                     pending_count;
 
        spinlock_t              resync_lock;
        int nr_pending;
@@ -69,8 +67,6 @@ struct r10_private_data_s {
        struct md_thread        *thread;
 };
 
-typedef struct r10_private_data_s conf_t;
-
 /*
  * this is our 'private' RAID10 bio.
  *