summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/collect/collect.c8
-rw-r--r--src/udev/udevd.c16
2 files changed, 6 insertions, 18 deletions
diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 882564a5f5..777542979a 100644
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -55,13 +55,9 @@ static int debug;
/* This can increase dynamically */
static size_t bufsize = BUFSIZE;
-static struct _mate *node_to_mate(struct udev_list_node *node)
+static inline struct _mate *node_to_mate(struct udev_list_node *node)
{
- char *mate;
-
- mate = (char *)node;
- mate -= offsetof(struct _mate, node);
- return (struct _mate *)mate;
+ return container_of(node, struct _mate, node);
}
static void sig_alrm(int signo)
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 59e2cfac6b..0d85960e63 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -99,13 +99,9 @@ struct event {
int ifindex;
};
-static struct event *node_to_event(struct udev_list_node *node)
+static inline struct event *node_to_event(struct udev_list_node *node)
{
- char *event;
-
- event = (char *)node;
- event -= offsetof(struct event, node);
- return (struct event *)event;
+ return container_of(node, struct event, node);
}
static void event_queue_cleanup(struct udev *udev, enum event_state type);
@@ -134,13 +130,9 @@ struct worker_message {
int exitcode;
};
-static struct worker *node_to_worker(struct udev_list_node *node)
+static inline struct worker *node_to_worker(struct udev_list_node *node)
{
- char *worker;
-
- worker = (char *)node;
- worker -= offsetof(struct worker, node);
- return (struct worker *)worker;
+ return container_of(node, struct worker, node);
}
static void event_queue_delete(struct event *event, bool export)