1 files changed, 6 insertions, 17 deletions

diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h
index 135b1b0a1554..007c2c68dd83 100644
--- a/drivers/md/raid10.h
+++ b/drivers/md/raid10.h
@@ -1,7 +1,7 @@
 #ifndef _RAID10_H
 #define _RAID10_H
 
-struct mirror_info {
+struct raid10_info {
         struct md_rdev  *rdev, *replacement;
         sector_t        head_position;
         int             recovery_disabled;      /* matches
@@ -13,8 +13,8 @@ struct mirror_info {
 
 struct r10conf {
         struct mddev            *mddev;
-        struct mirror_info      *mirrors;
-        struct mirror_info      *mirrors_new, *mirrors_old;
+        struct raid10_info      *mirrors;
+        struct raid10_info      *mirrors_new, *mirrors_old;
         spinlock_t              device_lock;
 
         /* geometry */
@@ -123,20 +123,6 @@ struct r10bio {
         } devs[0];
 };
 
-/* when we get a read error on a read-only array, we redirect to another
- * device without failing the first device, or trying to over-write to
- * correct the read error.  To keep track of bad blocks on a per-bio
- * level, we store IO_BLOCKED in the appropriate 'bios' pointer
- */
-#define IO_BLOCKED ((struct bio*)1)
-/* When we successfully write to a known bad-block, we need to remove the
- * bad-block marking which must be done from process context.  So we record
- * the success by setting devs[n].bio to IO_MADE_GOOD
- */
-#define IO_MADE_GOOD ((struct bio *)2)
-
-#define BIO_SPECIAL(bio) ((unsigned long)bio <= 2)
-
 /* bits for r10bio.state */
 enum r10bio_state {
         R10BIO_Uptodate,
@@ -159,4 +145,7 @@ enum r10bio_state {
  */
         R10BIO_Previous,
 };
+
+extern int md_raid10_congested(struct mddev *mddev, int bits);
+
 #endif