Assemble: close mdfd before returning from assemble_container_content

[thirdparty/mdadm.git] / mapfile.c

diff --git a/mapfile.c b/mapfile.c
index 955a1f98a243c1844b22a65d50909b42c9708c30..89836cf1c6e57fb0d78bc43363fe7ed9bbf34940 100644 (file)
--- a/mapfile.c
+++ b/mapfile.c
@@ -53,11 +53,13 @@ int map_write(struct map_ent *mel)
        f = fopen("/var/run/mdadm/map.new", "w");
        if (!f) {
                f = fopen("/var/run/mdadm.map.new", "w");
-               subdir = 1;
+               subdir = 0;
        }
        if (!f)
                return 0;
-       while (mel) {
+       for (; mel; mel = mel->next) {
+               if (mel->bad)
+                       continue;
                if (mel->devnum < 0)
                        fprintf(f, "mdp%d ", -1-mel->devnum);
                else
@@ -66,7 +68,6 @@ int map_write(struct map_ent *mel)
                fprintf(f, "%08x:%08x:%08x:%08x ", mel->uuid[0],
                        mel->uuid[1], mel->uuid[2], mel->uuid[3]);
                fprintf(f, "%s\n", mel->path);
-               mel = mel->next;
        }
        fflush(f);
        err = ferror(f);
@@ -86,6 +87,43 @@ int map_write(struct map_ent *mel)
                              "/var/run/mdadm.map") == 0;
 }
 
+
+static int lfd = -1;
+static int lsubdir = 0;
+int map_lock(struct map_ent **melp)
+{
+       if (lfd < 0) {
+               lfd = open("/var/run/mdadm/map.lock", O_CREAT|O_RDWR, 0600);
+               if (lfd < 0) {
+                       lfd = open("/var/run/mdadm.map.lock", O_CREAT|O_RDWR, 0600);
+                       lsubdir = 0;
+               } else
+                       lsubdir = 1;
+               if (lfd < 0)
+                       return -1;
+               if (lockf(lfd, F_LOCK, 0) != 0) {
+                       close(lfd);
+                       lfd = -1;
+                       return -1;
+               }
+       }
+       if (*melp)
+               map_free(*melp);
+       map_read(melp);
+       return 0;
+}
+
+void map_unlock(struct map_ent **melp)
+{
+       if (lfd >= 0)
+               close(lfd);
+       if (lsubdir)
+               unlink("/var/run/mdadm/map.lock");
+       else
+               unlink("/var/run/mdadm.map.lock");
+       lfd = -1;
+}
+
 void map_add(struct map_ent **melp,
            int devnum, char *metadata, int uuid[4], char *path)
 {
@@ -96,6 +134,7 @@ void map_add(struct map_ent **melp,
        memcpy(me->uuid, uuid, 16);
        me->path = strdup(path);
        me->next = *melp;
+       me->bad = 0;
        *melp = me;
 }
 
@@ -161,7 +200,8 @@ int map_update(struct map_ent **mpp, int devnum, char *metadata,
                }
        if (!mp)
                map_add(&map, devnum, metadata, uuid, path);
-       *mpp = NULL;
+       if (mpp)
+               *mpp = NULL;
        rv = map_write(map);
        map_free(map);
        return rv;
@@ -190,9 +230,52 @@ struct map_ent *map_by_uuid(struct map_ent **map, int uuid[4])
        if (!*map)
                map_read(map);
 
-       for (mp = *map ; mp ; mp = mp->next)
-               if (memcmp(uuid, mp->uuid, 16) == 0)
-                       return mp;
+       for (mp = *map ; mp ; mp = mp->next) {
+               if (memcmp(uuid, mp->uuid, 16) != 0)
+                       continue;
+               if (!mddev_busy(mp->devnum)) {
+                       mp->bad = 1;
+                       continue;
+               }
+               return mp;
+       }
+       return NULL;
+}
+
+struct map_ent *map_by_devnum(struct map_ent **map, int devnum)
+{
+       struct map_ent *mp;
+       if (!*map)
+               map_read(map);
+
+       for (mp = *map ; mp ; mp = mp->next) {
+               if (mp->devnum != devnum)
+                       continue;
+               if (!mddev_busy(mp->devnum)) {
+                       mp->bad = 1;
+                       continue;
+               }
+               return mp;
+       }
        return NULL;
+}
 
+struct map_ent *map_by_name(struct map_ent **map, char *name)
+{
+       struct map_ent *mp;
+       if (!*map)
+               map_read(map);
+
+       for (mp = *map ; mp ; mp = mp->next) {
+               if (strncmp(mp->path, "/dev/md/", 8) != 0)
+                       continue;
+               if (strcmp(mp->path+8, name) != 0)
+                       continue;
+               if (!mddev_busy(mp->devnum)) {
+                       mp->bad = 1;
+                       continue;
+               }
+               return mp;
+       }
+       return NULL;
 }