and use it instead of opencoding.
extern int signal_mdmon(int devnum);
extern char *devnum2devname(int num);
+extern int devname2devnum(char *name);
extern int fd2devnum(int fd);
static inline int dev2major(int d)
* there.
*/
struct mdstat_ent **ih;
- int dn2;
- if (strncmp(w, "md_d", 4)==0)
- dn2 = -1-strtoul(w+4, &ep, 10);
- else
- dn2 = strtoul(w+2, &ep, 10);
+ int dn2 = devname2devnum(w);
ih = &all;
while (ih != insert_here && *ih &&
(*ih)->devnum != dn2)
int sysfs_open(int devnum, char *devname, char *attr)
{
char fname[50];
- char sys_name[16];
int fd;
- if (devnum >= 0)
- sprintf(sys_name, "md%d", devnum);
- else
- sprintf(sys_name, "md_d%d",
- -1-devnum);
- sprintf(fname, "/sys/block/%s/md/", sys_name);
+ sprintf(fname, "/sys/block/%s/md/", devnum2devname(devnum));
if (devname) {
strcat(fname, devname);
strcat(fname, "/");
int devnum;
if (subarray)
*subarray++ = '\0';
- if (strncmp(dev, "md_d", 4) == 0)
- devnum = -1-atoi(dev+4);
- else
- devnum = atoi(dev+2);
+ devnum = devname2devnum(dev);
subarray = strdup(subarray);
if (sra)
sysfs_free(sra);
return strdup(name);
}
+int devname2devnum(char *name)
+{
+ char *ep;
+ int num;
+ if (strncmp(name, "md_d", 4)==0)
+ num = -1-strtoul(name+4, &ep, 10);
+ else
+ num = strtoul(name+2, &ep, 10);
+ return num;
+}
+
int fd2devnum(int fd)
{
struct stat stb;