File 1055-let-9719859c07aa13539ed2cd4b31972cd30f6785... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 1055-let-9719859c07aa13539ed2cd4b31972cd30f678543-apply.patch of Package systemd (Revision 58faf612310a3847c682f082ed9a240e)

Currently displaying revision 58faf612310a3847c682f082ed9a240e , Show latest

Exist only to be able to apply the patch
1056-udevd-add-event-timeout-commandline-option.patch
without the BLKRRPART ioctl patches.

--- systemd-210/src/udev/udevd.c
+++ systemd-210/src/udev/udevd.c	2014-07-30 11:52:34.318235685 +0000
@@ -1311,16 +1311,16 @@ int main(int argc, char *argv[])
                                 if (worker->state != WORKER_RUNNING)
                                         continue;
 
-                                if ((now(CLOCK_MONOTONIC) - worker->event_start_usec) > 30 * 1000 * 1000) {
+                                if ((now(CLOCK_MONOTONIC) - worker->event_start_usec) > 30 * USEC_PER_SEC) {
                                         log_error("worker [%u] %s timeout; kill it", worker->pid,
                                             worker->event ? worker->event->devpath : "<idle>");
                                         kill(worker->pid, SIGKILL);
                                         worker->state = WORKER_KILLED;
+
                                         /* drop reference taken for state 'running' */
                                         worker_unref(worker);
                                         if (worker->event) {
-                                                log_error("seq %llu '%s' killed",
-                                                          udev_device_get_seqnum(worker->event->dev), worker->event->devpath);
+                                                log_error("seq %llu '%s' killed", udev_device_get_seqnum(worker->event->dev), worker->event->devpath);
                                                 worker->event->exitcode = -64;
                                                 event_queue_delete(worker->event, true);
                                                 worker->event = NULL;

Places

File 1055-let-9719859c07aa13539ed2cd4b31972cd30f678543-apply.patch of Package systemd (Revision 58faf612310a3847c682f082ed9a240e)

Places