md: improve partition detection in md array

md currently uses ->media_changed to make sure rescan_partitions
is call on md array after they are assembled.

However that doesn't happen until the array is opened, which is later
than some people would like.

So use blkdev_ioctl to do the rescan immediately that the
array has been assembled.

This means we can remove all the ->change infrastructure as it was only used
to trigger a partition rescan.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 65814b0340cbfb60a2676a00ac4b6928d7d67c86..2901d0c0ee9ec4f166e8a6b5c8a080449e571c20 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3104,6 +3104,7 @@ static int do_md_run(mddev_t * mddev)
        struct gendisk *disk;
        struct mdk_personality *pers;
        char b[BDEVNAME_SIZE];
+       struct block_device *bdev;
 
        if (list_empty(&mddev->disks))
                /* cannot run an array with no devices.. */
@@ -3331,7 +3332,13 @@ static int do_md_run(mddev_t * mddev)
        md_wakeup_thread(mddev->thread);
        md_wakeup_thread(mddev->sync_thread); /* possibly kick off a reshape */
 
-       mddev->changed = 1;
+       bdev = bdget_disk(mddev->gendisk, 0);
+       if (bdev) {
+               bd_set_size(bdev, mddev->array_size << 1);
+               blkdev_ioctl(bdev->bd_inode, NULL, BLKRRPART, 0);
+               bdput(bdev);
+       }
+
        md_new_event(mddev);
        kobject_uevent(&mddev->gendisk->kobj, KOBJ_CHANGE);
        return 0;
@@ -3453,7 +3460,6 @@ static int do_md_stop(mddev_t * mddev, int mode)
                        mddev->pers = NULL;
 
                        set_capacity(disk, 0);
-                       mddev->changed = 1;
 
                        if (mddev->ro)
                                mddev->ro = 0;
@@ -4593,20 +4599,6 @@ static int md_release(struct inode *inode, struct file * file)
        return 0;
 }
 
-static int md_media_changed(struct gendisk *disk)
-{
-       mddev_t *mddev = disk->private_data;
-
-       return mddev->changed;
-}
-
-static int md_revalidate(struct gendisk *disk)
-{
-       mddev_t *mddev = disk->private_data;
-
-       mddev->changed = 0;
-       return 0;
-}
 static struct block_device_operations md_fops =
 {
        .owner          = THIS_MODULE,
@@ -4614,8 +4606,6 @@ static struct block_device_operations md_fops =
        .release        = md_release,
        .ioctl          = md_ioctl,
        .getgeo         = md_getgeo,
-       .media_changed  = md_media_changed,
-       .revalidate_disk= md_revalidate,
 };
 
 static int md_thread(void * arg)

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 97ee870b265d866ffa818bdf83dc7f551cd40d7b..1b7130cad21fc962876a7efcc37ccbd8b8c71cad 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2063,7 +2063,6 @@ static int raid1_resize(mddev_t *mddev, sector_t sectors)
         */
        mddev->array_size = sectors>>1;
        set_capacity(mddev->gendisk, mddev->array_size << 1);
-       mddev->changed = 1;
        if (mddev->array_size > mddev->size && mddev->recovery_cp == MaxSector) {
                mddev->recovery_cp = mddev->size << 1;
                set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 061375ee6592517cf1796c2ff730b5cefcbc7269..a72e70ad09754f4a5a5616639fdfd513e0d19a18 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -3864,7 +3864,6 @@ static int raid5_resize(mddev_t *mddev, sector_t sectors)
        sectors &= ~((sector_t)mddev->chunk_size/512 - 1);
        mddev->array_size = (sectors * (mddev->raid_disks-conf->max_degraded))>>1;
        set_capacity(mddev->gendisk, mddev->array_size << 1);
-       mddev->changed = 1;
        if (sectors/2  > mddev->size && mddev->recovery_cp == MaxSector) {
                mddev->recovery_cp = mddev->size << 1;
                set_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
@@ -3999,7 +3998,6 @@ static void end_reshape(raid5_conf_t *conf)
                conf->mddev->array_size = conf->mddev->size *
                        (conf->raid_disks - conf->max_degraded);
                set_capacity(conf->mddev->gendisk, conf->mddev->array_size << 1);
-               conf->mddev->changed = 1;
 
                bdev = bdget_disk(conf->mddev->gendisk, 0);
                if (bdev) {

diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index de72c49747c8b20ac6f0844bc2703d8f22f347b9..a121f36f443729feef8ae03c240496429a64cf4b 100644 (file)
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -201,7 +201,6 @@ struct mddev_s
        struct mutex                    reconfig_mutex;
        atomic_t                        active;
 
-       int                             changed;        /* true if we might need to reread partition info */
        int                             degraded;       /* whether md should consider
                                                         * adding a spare
                                                         */