Merge branch 'master' into devel-3.0

[thirdparty/mdadm.git] / Incremental.c

diff --git a/Incremental.c b/Incremental.c
index 474f78d6d95bbbfdbad0f2bccc79a7334700fcc9..43b1f77638a2977e73126355591eabe8c4c5d615 100644 (file)
--- a/Incremental.c
+++ b/Incremental.c
@@ -596,59 +596,6 @@ static int count_active(struct supertype *st, int mdfd, char **availp,
        return cnt + cnt1;
 }
 
-void RebuildMap(void)
-{
-       struct mdstat_ent *mdstat = mdstat_read(0, 0);
-       struct mdstat_ent *md;
-       struct map_ent *map = NULL;
-       int mdp = get_mdp_major();
-
-       for (md = mdstat ; md ; md = md->next) {
-               struct mdinfo *sra = sysfs_read(-1, md->devnum, GET_DEVS);
-               struct mdinfo *sd;
-
-               for (sd = sra->devs ; sd ; sd = sd->next) {
-                       char dn[30];
-                       int dfd;
-                       int ok;
-                       struct supertype *st;
-                       char *path;
-                       struct mdinfo info;
-
-                       sprintf(dn, "%d:%d", sd->disk.major, sd->disk.minor);
-                       dfd = dev_open(dn, O_RDONLY);
-                       if (dfd < 0)
-                               continue;
-                       st = guess_super(dfd);
-                       if ( st == NULL)
-                               ok = -1;
-                       else
-                               ok = st->ss->load_super(st, dfd, NULL);
-                       close(dfd);
-                       if (ok != 0)
-                               continue;
-                       st->ss->getinfo_super(st, &info);
-                       if (md->devnum > 0)
-                               path = map_dev(MD_MAJOR, md->devnum, 0);
-                       else
-                               path = map_dev(mdp, (-1-md->devnum)<< 6, 0);
-                       map_add(&map, md->devnum,
-                               info.text_version,
-                               info.uuid, path ? : "/unknown");
-                       st->ss->free_super(st);
-                       break;
-               }
-               sysfs_free(sra);
-       }
-       map_write(map);
-       map_free(map);
-       for (md = mdstat ; md ; md = md->next) {
-               struct mdinfo *sra = sysfs_read(-1, md->devnum, GET_VERSION);
-               sysfs_uevent(sra, "change");
-               sysfs_free(sra);
-       }
-}
-
 int IncrementalScan(int verbose)
 {
        /* look at every device listed in the 'map' file.