Introduce stat2kname() and fd2kname()

These are similar to stat2devnm() and fd2devnm() but not limited to md
devices. If the device is a partition they will return its kernel name,
not the whole device's name. For more information see commit:
8d83493 ("Introduce devid2kname - slightly different to devid2devnm.")

Also remove unsued declaration for fmt_devname().

Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>

diff --git a/lib.c b/lib.c
index 6808f62d77ced0d6b044f48fa43a9b289f55b16b..621edf3bfb29afc9250783080488f8149dd2028b 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -84,6 +84,21 @@ char *devid2kname(int devid)
        return NULL;
 }
 
+char *stat2kname(struct stat *st)
+{
+       if ((S_IFMT & st->st_mode) != S_IFBLK)
+               return NULL;
+       return devid2kname(st->st_rdev);
+}
+
+char *fd2kname(int fd)
+{
+       struct stat stb;
+       if (fstat(fd, &stb) == 0)
+               return stat2kname(&stb);
+       return NULL;
+}
+
 char *devid2devnm(int devid)
 {
        char path[30];

diff --git a/mdadm.h b/mdadm.h
index 3b9607632ca54497812dccb4f4d3b1f25e0df446..d209488b6539fcf2b6eb938c631fd3fe0ce2be08 100755 (executable)
--- a/mdadm.h
+++ b/mdadm.h
@@ -1474,7 +1474,8 @@ void abort_reshape(struct mdinfo *sra);
 
 void *super1_make_v0(struct supertype *st, struct mdinfo *info, mdp_super_t *sb0);
 
-extern void fmt_devname(char *name, int num);
+extern char *stat2kname(struct stat *st);
+extern char *fd2kname(int fd);
 extern char *stat2devnm(struct stat *st);
 extern char *fd2devnm(int fd);
 

diff --git a/super-intel.c b/super-intel.c
index f04ac2f6ed1c38368896cd0eb11f5244f6a3fdd7..ba3ee48b65596914ccc030a2d1f72bfd24d2e43d 100644 (file)
--- a/super-intel.c
+++ b/super-intel.c
@@ -4589,7 +4589,11 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
 
        /* retry the load if we might have raced against mdmon */
        if (rv == 3) {
-               struct mdstat_ent *mdstat = mdstat_by_component(fd2devnm(fd));
+               struct mdstat_ent *mdstat = NULL;
+               char *name = fd2kname(fd);
+
+               if (name)
+                       mdstat = mdstat_by_component(name);
 
                if (mdstat && mdmon_running(mdstat->devnm) && getpid() != mdmon_pid(mdstat->devnm)) {
                        for (retry = 0; retry < 3; retry++) {