[PATCH] md: Store rdev instead of bdev in per-personality status arrays

Holding the rdev instead of the bdev does cause an extra
de-reference, but it is conceptually cleaner and will allow
lots more tidying up.

4 files changed, 8 insertions, 8 deletions

diff --git a/include/linux/raid/linear.h b/include/linux/raid/linear.h
index dfb588a60ea6..44c79eb016ac 100644
--- a/include/linux/raid/linear.h
+++ b/include/linux/raid/linear.h
@@ -4,7 +4,7 @@
 #include <linux/raid/md.h>
 
 struct dev_info {
-	struct block_device *bdev;
+	mdk_rdev_t	*rdev;
 	unsigned long	size;
 	unsigned long	offset;
 };
diff --git a/include/linux/raid/multipath.h b/include/linux/raid/multipath.h
index 6ceb343eedb0..c78b14d61aff 100644
--- a/include/linux/raid/multipath.h
+++ b/include/linux/raid/multipath.h
@@ -5,7 +5,7 @@
 #include <linux/bio.h>
 
 struct multipath_info {
-	struct block_device *bdev;
+	mdk_rdev_t	*rdev;
 
 	/*
 	 * State bits:
diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h
index 28651c4d0658..a27ed231c596 100644
--- a/include/linux/raid/raid1.h
+++ b/include/linux/raid/raid1.h
@@ -6,7 +6,7 @@
 typedef struct mirror_info mirror_info_t;
 
 struct mirror_info {
-	struct block_device *bdev;
+	mdk_rdev_t	*rdev;
 	sector_t	head_position;
 	atomic_t	nr_pending;
 
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
index 7e8333a75bd4..bd9e60a1e29e 100644
--- a/include/linux/raid/raid5.h
+++ b/include/linux/raid/raid5.h
@@ -192,11 +192,11 @@ struct stripe_head {
  
 
 struct disk_info {
-	struct block_device *bdev;
-	int	operational;
-	int	write_only;
-	int	spare;
-	int	used_slot;
+	mdk_rdev_t	*rdev;
+	int		operational;
+	int		write_only;
+	int		spare;
+	int		used_slot;
 };
 
 struct raid5_private_data {