[PATCH] MD - Add raid_disk field to rdev

Add raid_disk field to rdev

Also change find_rdev_nr to find based on position
in array (raid_disk) not position in superblock (number).

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 5e71165662ebbf0b2c398987744a118de02b3a32..5487ce306d71ee11199328b4ef9bfdaac0224c6f 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -52,7 +52,7 @@ static int linear_run (mddev_t *mddev)
        conf->smallest = NULL;
        cnt = 0;
        ITERATE_RDEV(mddev,rdev,tmp) {
-               int j = rdev->sb->this_disk.raid_disk;
+               int j = rdev->raid_disk;
                dev_info_t *disk = conf->disks + j;
 
                if (j < 0 || j > mddev->sb->raid_disks || disk->bdev) {

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 04d44dd199cf8a370795c91ac30214958a091650..dac5d26ef36c1964e96ce398b91fda8df0446ed3 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -242,7 +242,7 @@ mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr)
        struct list_head *tmp;
 
        ITERATE_RDEV(mddev,rdev,tmp) {
-               if (rdev->desc_nr == nr)
+               if (rdev->raid_disk == nr)
                        return rdev;
        }
        return NULL;
@@ -1178,8 +1178,11 @@ static int analyze_sbs(mddev_t * mddev)
                if (sb->level == LEVEL_MULTIPATH) {
                        rdev->alias_device = !!i;
                        rdev->desc_nr = i++;
-               } else
+                       rdev->raid_disk = rdev->desc_nr;
+               } else {
                        rdev->desc_nr = rdev->sb->this_disk.number;
+                       rdev->raid_disk = sb->disks[rdev->desc_nr].raid_disk;
+               }
        }
        /*
         * Fix up changed device names ... but only if this disk has a
@@ -2106,6 +2109,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
                }
                rdev->old_dev = dev;
                rdev->desc_nr = info->number;
+               rdev->raid_disk = info->raid_disk;
 
                bind_rdev_to_array(rdev, mddev);
 

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 91238ae3c2bcc993264a9e90b14f8d0da8b016fd..cdf94c0928e5bf15c7cc6bd636ab87bab9c2de0d 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -713,16 +713,19 @@ static int raid1_spare_active(mddev_t *mddev)
        /*
         * do the switch finally
         */
-       spare_rdev = find_rdev_nr(mddev, spare_desc->number);
-       failed_rdev = find_rdev_nr(mddev, failed_desc->number);
+       spare_rdev = find_rdev_nr(mddev, spare_disk);
+       failed_rdev = find_rdev_nr(mddev, failed_disk);
 
        /*
         * There must be a spare_rdev, but there may not be a
         * failed_rdev. That slot might be empty...
         */
        spare_rdev->desc_nr = failed_desc->number;
-       if (failed_rdev)
+       spare_rdev->raid_disk = failed_disk;
+       if (failed_rdev) {
                failed_rdev->desc_nr = spare_desc->number;
+               failed_rdev->raid_disk = spare_disk;
+       }
 
        xchg_values(*spare_desc, *failed_desc);
        xchg_values(*fdisk, *sdisk);

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index a4c9d407ddc1ca02eccb659835f8c8041a3b61de..966195f7e7572feec6669c1caafad36dd5032067 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1739,15 +1739,18 @@ static int raid5_spare_active(mddev_t *mddev)
        /*
         * do the switch finally
         */
-       spare_rdev = find_rdev_nr(mddev, spare_desc->number);
-       failed_rdev = find_rdev_nr(mddev, failed_desc->number);
+       spare_rdev = find_rdev_nr(mddev, spare_disk);
+       failed_rdev = find_rdev_nr(mddev, failed_disk);
 
        /* There must be a spare_rdev, but there may not be a
         * failed_rdev.  That slot might be empty...
         */
        spare_rdev->desc_nr = failed_desc->number;
-       if (failed_rdev)
+       spare_rdev->raid_disk = failed_disk;
+       if (failed_rdev) {
                failed_rdev->desc_nr = spare_desc->number;
+               failed_rdev->raid_disk = spare_disk;
+       }
        
        xchg_values(*spare_desc, *failed_desc);
        xchg_values(*fdisk, *sdisk);

diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 214a9163269ae45c9d23854f49aa188812e33043..18f89adb4b0c7ac54c1c310973bfcb5f80005053 100644 (file)
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -159,6 +159,7 @@ struct mdk_rdev_s
        int alias_device;               /* device alias to the same disk */
        int faulty;                     /* if faulty do not issue IO requests */
        int desc_nr;                    /* descriptor index in the superblock */
+       int raid_disk;                  /* role of device in array */
 };
 
 typedef struct mdk_personality_s mdk_personality_t;