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

[PATCH] Just live with a sleep(1) in namedev for now until libsysfs is fixed up.

This commit is contained in:
greg@kroah.com 2003-12-22 19:07:08 -08:00 committed by Greg KH
parent dac056aa30
commit 1edbb8d350
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
namedev.c
View File

@ -635,8 +635,6 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
struct sysfs_device *sysfs_device; struct sysfs_device *sysfs_device;
struct sysfs_class_device *class_dev_parent; struct sysfs_class_device *class_dev_parent;
int loop; int loop;
int retval;
char filename[SYSFS_PATH_MAX + 6];
/* FIXME!!! */ /* FIXME!!! */
/* This is needed here as we can easily out-race the placement of the /* This is needed here as we can easily out-race the placement of the
@ -646,10 +644,17 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
* class device really shows up. For now, we live with the time * class device really shows up. For now, we live with the time
* delay... * delay...
*/ */
// sleep(1); sleep(1);
#if 0 /* FIXME
Something like this could also work, but for some reason doesn't,
I also tried just stat() on the device symlink, but that still
has nasty races, I'm probably doing something stupid... :( */
loop = 10; loop = 10;
while (loop--) { while (loop--) {
struct stat buf; struct stat buf;
int retval;
char filename[SYSFS_PATH_MAX + 6];
strcpy(filename, class_dev->path); strcpy(filename, class_dev->path);
strcat(filename, "/device"); strcat(filename, "/device");
@ -657,49 +662,30 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
retval = stat(filename, &buf); retval = stat(filename, &buf);
if (!retval) if (!retval)
break; break;
#if 0
/* bah, let's go backwards up a level to see if the device is there, /* 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 * as block partitions don't point to the physical device. Need to fix that
* up in the kernel... * up in the kernel...
*/ */
if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) { if (strcmp(class_dev->classname, SYSFS_BLOCK_NAME) == 0) {
if (isdigit(class_dev->path[strlen(class_dev->path)-1])) { if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
char *temp = strrchr(filename, '/'); class_dev_parent = sysfs_get_classdev_parent(class_dev);
if (temp) { if (class_dev_parent == NULL) {
*temp = 0x00; dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
temp = strrchr(filename, '/'); } else {
if (temp) { strcpy(filename, class_dev_parent->path);
*temp = 0x00; strcat(filename, "/device");
strcat(filename, "/device"); dbg("looking for '%s'", filename);
dbg("looking for '%s'", filename); retval = stat(filename, &buf);
retval = stat(filename, &buf); if (!retval)
if (!retval) break;
break;
}
} }
} }
} }
#endif
// class_dev_parent = sysfs_get_classdev_parent(class_dev);
// if (class_dev_parent == NULL) {
// dbg("sysfs_get_classdev_parent for class device '%s' failed", class_dev->name);
// } else {
// strcpy(filename, class_dev_parent->path);
// strcat(filename, "/device");
// dbg("looking for '%s'", filename);
// retval = stat(filename, &buf);
// if (!retval)
// break;
// }
// }
// }
/* sleep to give the kernel a chance to create the device file */ /* sleep to give the kernel a chance to create the device file */
sleep(1); sleep(1);
} }
// retval = -ENODEV; #endif
// sleep(1);
loop = 1; /* FIXME put a real value in here for when everything is fixed... */ loop = 1; /* FIXME put a real value in here for when everything is fixed... */
while (loop--) { while (loop--) {
/* find the sysfs_device for this class device */ /* find the sysfs_device for this class device */
@ -728,10 +714,10 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
} }
} }
/* sleep to give the kernel a chance to create the link */ /* sleep to give the kernel a chance to create the link */
/* sleep(1); */ sleep(1);
} }
// dbg("Timed out waiting for device symlink, continuing on anyway..."); dbg("Timed out waiting for device symlink, continuing on anyway...");
exit: exit:
return sysfs_device; return sysfs_device;
} }