Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sysfs: fix sysfs_disk_to_scsi_id 

Not sure how this ever worked, but now we just try to parse a directory
name that looks like <host>:<bus>:<target>:<lun>.

Array creation segfaults on Fedora 14 without this.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Dan Williams 2011-08-25 19:14:19 -07:00 committed by NeilBrown
parent 0ec1f4e8de
commit d8924477b7
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sysfs.c
View File

@ -709,9 +709,9 @@ int sysfs_disk_to_scsi_id(int fd, __u32 *id)
/* from an open block device, try to retrieve it scsi_id */
struct stat st;
char path[256];
char *c1, *c2;
DIR *dir;
struct dirent *de;
int host, bus, target, lun;
if (fstat(fd, &st))
return 1;
@ -723,32 +723,22 @@ int sysfs_disk_to_scsi_id(int fd, __u32 *id)
if (!dir)
return 1;
de = readdir(dir);
while (de) {
if (strchr(de->d_name, ':'))
for (de = readdir(dir); de; de = readdir(dir)) {
int count;
if (de->d_type != DT_DIR)
continue;
count = sscanf(de->d_name, "%d:%d:%d:%d", &host, &bus, &target, &lun);
if (count == 4)
break;
de = readdir(dir);
}
closedir(dir);
if (!de)
return 1;
c1 = de->d_name;
c2 = strchr(c1, ':');
*c2 = '\0';
*id = strtol(c1, NULL, 10) << 24; /* host */
c1 = c2 + 1;
c2 = strchr(c1, ':');
*c2 = '\0';
*id |= strtol(c1, NULL, 10) << 16; /* bus */
c1 = c2 + 1;
c2 = strchr(c1, ':');
*c2 = '\0';
*id |= strtol(c1, NULL, 10) << 8; /* target */
c1 = c2 + 1;
*id |= strtol(c1, NULL, 10); /* lun */
*id = (host << 24) | (bus << 16) | (target << 8) | (lun << 0);
return 0;
}