picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[PATCH] clean up the way we find the sysdevice for a block device for namedev.

Browse source
This commit is contained in:
greg@kroah.com 2003-11-12 17:38:14 -08:00 committed by Greg KH
parent 4c7f03c33f
commit 7bd22a78a1
1 changed files with 43 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
namedev.c
View file

@ -599,39 +599,18 @@ static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
{
struct list_head *tmp;
struct sysfs_device *sysfs_device = NULL;
struct sysfs_class_device *class_dev_parent = NULL;
int retval = 0;
int found;
udev->mode = 0;
if (class_dev->sysdevice) {
dbg_parse("class_dev->sysdevice->path = '%s'", class_dev->sysdevice->path);
dbg_parse("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
} else {
dbg_parse("class_dev->name = '%s'", class_dev->name);
}
list_for_each(tmp, &config_device_list) {
struct config_device *dev = list_entry(tmp, struct config_device, node);
switch (dev->type) {
case LABEL:
{
struct sysfs_attribute *tmpattr = NULL;
struct sysfs_class_device *class_dev_parent = NULL;
char *temp = NULL;
dbg_parse("LABEL: match file '%s' with value '%s'",
dev->sysfs_file, dev->sysfs_value);
/* try to find the attribute in the class device directory */
tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
if (tmpattr)
goto label_found;
udev->mode = 0;
/* look in the class device directory if present */
/* find the sysfs_device for this class device */
if (class_dev->sysdevice) {
tmpattr = sysfs_get_device_attr(class_dev->sysdevice, dev->sysfs_file);
if (tmpattr)
goto label_found;
}
sysfs_device = class_dev->sysdevice;
} else {
/* bah, let's go backwards up a level to see if the device is there,
* as block partitions don't point to the physical device. Need to fix that
* up in the kernel...
@ -649,37 +628,49 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
class_dev_parent = sysfs_open_class_device(path);
if (class_dev_parent == NULL) {
dbg("sysfs_open_class_device at '%s' failed", path);
continue;
}
} else {
dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
if (class_dev_parent->sysdevice)
sysfs_device = class_dev_parent->sysdevice;
}
}
}
}
if (sysfs_device) {
dbg_parse("sysfs_device->path = '%s'", sysfs_device->path);
dbg_parse("sysfs_device->bus_id = '%s'", sysfs_device->bus_id);
} else {
dbg_parse("class_dev->name = '%s'", class_dev->name);
}
list_for_each(tmp, &config_device_list) {
struct config_device *dev = list_entry(tmp, struct config_device, node);
switch (dev->type) {
case LABEL:
{
struct sysfs_attribute *tmpattr = NULL;
dbg_parse("LABEL: match file '%s' with value '%s'",
dev->sysfs_file, dev->sysfs_value);
/* try to find the attribute in the class device directory */
tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
tmpattr = sysfs_get_classdev_attr(class_dev, dev->sysfs_file);
if (tmpattr)
goto label_found;
/* look in the class device directory if present */
if (class_dev_parent->sysdevice) {
tmpattr = sysfs_get_device_attr(class_dev_parent->sysdevice, dev->sysfs_file);
if (sysfs_device) {
tmpattr = sysfs_get_device_attr(sysfs_device, dev->sysfs_file);
if (tmpattr)
goto label_found;
}
}
}
if (class_dev_parent)
sysfs_close_class_device(class_dev_parent);
continue;
label_found:
tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, tmpattr->value, dev->sysfs_value);
if (strcmp(dev->sysfs_value, tmpattr->value) != 0) {
if (class_dev_parent)
sysfs_close_class_device(class_dev_parent);
if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
continue;
}
strcpy(udev->name, dev->name);
if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
@ -694,8 +685,6 @@ label_found:
dbg_parse("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
dev->sysfs_file, dev->sysfs_value, udev->name,
dev->owner, dev->group, dev->mode);
if (class_dev_parent)
sysfs_close_class_device(class_dev_parent);
goto done;
break;
}
@ -796,6 +785,10 @@ done:
udev->owner[0] = 0x00;
udev->group[0] = 0x00;
}
if (class_dev_parent)
sysfs_close_class_device(class_dev_parent);
return 0;
}