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] replace tdb database by simple lockless file database
[elogind.git]
/
udev.h
diff --git
a/udev.h
b/udev.h
index f7a13a634b77e75fff756248e0ca98df7579b0a2..1cf4ad7eae988893029ed7d784c3aa7b144fdcbe 100644
(file)
--- a/
udev.h
+++ b/
udev.h
@@
-26,7
+26,7
@@
#include <sys/param.h>
#include "libsysfs/sysfs/libsysfs.h"
#include <sys/param.h>
#include "libsysfs/sysfs/libsysfs.h"
-#define ALARM_TIMEOUT
3
0
+#define ALARM_TIMEOUT
12
0
#define COMMENT_CHARACTER '#'
#define NAME_SIZE 256
#define COMMENT_CHARACTER '#'
#define NAME_SIZE 256
@@
-41,26
+41,21
@@
#define LINE_SIZE 256
#define LINE_SIZE 256
-/* length of public data to store in udevdb */
-#define UDEVICE_DB_LEN (offsetof(struct udevice, devpath))
-
struct udevice {
struct udevice {
+ char devpath[DEVPATH_SIZE];
+ char subsystem[SUBSYSTEM_SIZE];
char name[NAME_SIZE];
char owner[OWNER_SIZE];
char group[GROUP_SIZE];
char type;
int major;
int minor;
char name[NAME_SIZE];
char owner[OWNER_SIZE];
char group[GROUP_SIZE];
char type;
int major;
int minor;
- unsigned int mode; /* not mode_t due to conflicting definitions in different libcs */
+ mode_t mode;
char symlink[NAME_SIZE];
int partitions;
int config_line;
char config_file[NAME_SIZE];
long config_uptime;
char symlink[NAME_SIZE];
int partitions;
int config_line;
char config_file[NAME_SIZE];
long config_uptime;
-
- /* private data, not stored in udevdb */
- char devpath[DEVPATH_SIZE];
- char subsystem[SUBSYSTEM_SIZE];
char bus_id[SYSFS_NAME_LEN];
char bus[SYSFS_NAME_LEN];
char program_result[NAME_SIZE];
char bus_id[SYSFS_NAME_LEN];
char bus[SYSFS_NAME_LEN];
char program_result[NAME_SIZE];
@@
-81,7
+76,7
@@
extern char **main_argv;
extern char **main_envp;
extern char sysfs_path[SYSFS_PATH_MAX];
extern char udev_root[PATH_MAX];
extern char **main_envp;
extern char sysfs_path[SYSFS_PATH_MAX];
extern char udev_root[PATH_MAX];
-extern char udev_db_
filename
[PATH_MAX+NAME_MAX];
+extern char udev_db_
path
[PATH_MAX+NAME_MAX];
extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
extern char udev_config_filename[PATH_MAX+NAME_MAX];
extern char udev_rules_filename[PATH_MAX+NAME_MAX];
extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
extern char udev_config_filename[PATH_MAX+NAME_MAX];
extern char udev_rules_filename[PATH_MAX+NAME_MAX];