chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev build tweaks to tdb's spinlock code
[elogind.git]
/
udev-remove.c
diff --git
a/udev-remove.c
b/udev-remove.c
index 29063efb0de0c8c0ac5ffbc2322a178a7e8cadcc..666928f318fa7699062f75009f503179262a1ce0 100644
(file)
--- a/
udev-remove.c
+++ b/
udev-remove.c
@@
-36,22
+36,30
@@
/*
/*
- *
Here would go a call to the naming deamon, to get the name we want to hav
e
- *
for this device. But for now, let's just default to whatever the kernel is
- *
calling the device as that will keep the "old-style" naming policy
+ *
Look up the sysfs path in the database to see if we have named this devic
e
+ *
something different from the kernel name. If we have, us it. If not, use
+ *
the default kernel name for lack of anything else to know to do.
*/
*/
-static char *get_name(char *
dev
, int major, int minor)
+static char *get_name(char *
path
, int major, int minor)
{
static char name[100];
{
static char name[100];
+ struct udevice *dev;
char *temp;
char *temp;
- temp = strrchr(dev, '/');
+ dev = udevdb_get_dev(path);
+ if (dev != NULL) {
+ strcpy(name, dev->name);
+ goto exit;
+ }
+
+ dbg("%s not found in database, falling back on default name", path);
+ temp = strrchr(path, '/');
if (temp == NULL)
return NULL;
strncpy(name, &temp[1], sizeof(name));
if (temp == NULL)
return NULL;
strncpy(name, &temp[1], sizeof(name));
+exit:
dbg("name is %s", name);
dbg("name is %s", name);
-
return &name[0];
}
return &name[0];
}
@@
-62,7
+70,7
@@
static int delete_node(char *name)
{
char filename[255];
{
char filename[255];
- strncpy(filename,
UDEV_ROOT
, sizeof(filename));
+ strncpy(filename,
udev_root
, sizeof(filename));
strncat(filename, name, sizeof(filename));
dbg("unlinking %s", filename);
strncat(filename, name, sizeof(filename));
dbg("unlinking %s", filename);
@@
-81,7
+89,7
@@
int udev_remove_device(char *device, char *subsystem)
goto exit;
}
goto exit;
}
- udevdb_delete_
udevice(nam
e);
+ udevdb_delete_
dev(devic
e);
return delete_node(name);
return delete_node(name);