lib: devid2kname() should take a dev_t

Make devid2kname() and devid2devnm() consistent in their APIs

Signed-off-by: Jes Sorensen <jsorensen@fb.com>

diff --git a/lib.c b/lib.c
index be093e8c30cbf0f490d0e3b860f3b22fd66b13ab..60890b95baf888762e0a1cf9c919e1314abf1285 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -61,7 +61,7 @@ int get_mdp_major(void)
        return mdp_major;
 }
 
        return mdp_major;
 }
 

-char *devid2kname(int devid)
+char *devid2kname(dev_t devid)

 {
        char path[30];
        char link[PATH_MAX];
 {
        char path[30];
        char link[PATH_MAX];


@@ -73,8 +73,7 @@ char *devid2kname(int devid)
         * /sys/dev/block/%d:%d link which must look like
         * and take the last component.
         */
         * /sys/dev/block/%d:%d link which must look like
         * and take the last component.
         */

-       sprintf(path, "/sys/dev/block/%d:%d", major(devid),
-               minor(devid));
+       sprintf(path, "/sys/dev/block/%d:%d", major(devid), minor(devid));

        n = readlink(path, link, sizeof(link) - 1);
        if (n > 0) {
                link[n] = 0;
        n = readlink(path, link, sizeof(link) - 1);
        if (n > 0) {
                link[n] = 0;

diff --git a/mdadm.h b/mdadm.h
index 191ae8f7552b64030f47f7757d803b73a2ef0c74..db08188317f8525603ab3144b846f4abbdc24571 100644 (file)
--- a/mdadm.h
+++ b/mdadm.h
@@ -1537,7 +1537,7 @@ extern void print_r10_layout(int layout);
 extern char *find_free_devnm(int use_partitions);
 
 extern void put_md_name(char *name);
 extern char *find_free_devnm(int use_partitions);
 
 extern void put_md_name(char *name);

-extern char *devid2kname(int devid);
+extern char *devid2kname(dev_t devid);

 extern char *devid2devnm(dev_t devid);
 extern dev_t devnm2devid(char *devnm);
 extern char *get_md_name(char *devnm);
 extern char *devid2devnm(dev_t devid);
 extern dev_t devnm2devid(char *devnm);
 extern char *get_md_name(char *devnm);