/[packages]/cauldron/systemd/current/SOURCES/0505-reinstate-TIMEOUT-handling.patch
ViewVC logotype

Diff of /cauldron/systemd/current/SOURCES/0505-reinstate-TIMEOUT-handling.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 794632 by colin, Sat Aug 30 16:26:21 2014 UTC revision 794633 by colin, Wed Oct 29 22:44:59 2014 UTC
# Line 1  Line 1 
1  From 5427f5e917c52e332925d920721e3900e7379fd9 Mon Sep 17 00:00:00 2001  From 7c10497d2ab52a400b24488fd16b742cde91e214 Mon Sep 17 00:00:00 2001
2  From: Tom Gundersen <teg@jklm.no>  From: Tom Gundersen <teg@jklm.no>
3  Date: Thu, 15 Mar 2012 02:12:43 +0100  Date: Thu, 15 Mar 2012 02:12:43 +0100
4  Subject: [PATCH 505/513] reinstate TIMEOUT= handling  Subject: [PATCH 505/513] reinstate TIMEOUT= handling
# Line 14  Signed-off-by: Tom Gundersen <teg@jklm.n Line 14  Signed-off-by: Tom Gundersen <teg@jklm.n
14   3 files changed, 30 insertions(+), 3 deletions(-)   3 files changed, 30 insertions(+), 3 deletions(-)
15    
16  diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c  diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
17  index f26a4c4..1a70369 100644  index 2699374..f59aaae 100644
18  --- a/src/libudev/libudev-device.c  --- a/src/libudev/libudev-device.c
19  +++ b/src/libudev/libudev-device.c  +++ b/src/libudev/libudev-device.c
20  @@ -80,6 +80,7 @@ struct udev_device {  @@ -80,6 +80,7 @@ struct udev_device {
# Line 25  index f26a4c4..1a70369 100644 Line 25  index f26a4c4..1a70369 100644
25           int devlink_priority;           int devlink_priority;
26           int refcount;           int refcount;
27           dev_t devnum;           dev_t devnum;
28  @@ -174,6 +175,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)  @@ -174,6 +175,21 @@ int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
29           return 0;           return 0;
30   }   }
31    
# Line 65  index f26a4c4..1a70369 100644 Line 65  index f26a4c4..1a70369 100644
65           /* copy global properties */           /* copy global properties */
66           udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))           udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
67  diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h  diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
68  index ae97557..61a6bc0 100644  index 7e11f73..40acdc3 100644
69  --- a/src/libudev/libudev-private.h  --- a/src/libudev/libudev-private.h
70  +++ b/src/libudev/libudev-private.h  +++ b/src/libudev/libudev-private.h
71  @@ -74,6 +74,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);  @@ -76,6 +76,7 @@ void udev_device_set_is_initialized(struct udev_device *udev_device);
  void udev_device_set_is_initialized(struct udev_device *udev_device);  
72   int udev_device_add_tag(struct udev_device *udev_device, const char *tag);   int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
73     void udev_device_remove_tag(struct udev_device *udev_device, const char *tag);
74   void udev_device_cleanup_tags_list(struct udev_device *udev_device);   void udev_device_cleanup_tags_list(struct udev_device *udev_device);
75  +int udev_device_get_timeout(struct udev_device *udev_device);  +int udev_device_get_timeout(struct udev_device *udev_device);
76   usec_t udev_device_get_usec_initialized(struct udev_device *udev_device);   usec_t udev_device_get_usec_initialized(struct udev_device *udev_device);
77   void udev_device_set_usec_initialized(struct udev_device *udev_device, usec_t usec_initialized);   void udev_device_set_usec_initialized(struct udev_device *udev_device, usec_t usec_initialized);
78   int udev_device_get_devlink_priority(struct udev_device *udev_device);   int udev_device_get_devlink_priority(struct udev_device *udev_device);
79  diff --git a/src/udev/udevd.c b/src/udev/udevd.c  diff --git a/src/udev/udevd.c b/src/udev/udevd.c
80  index f882cfb..a07da35 100644  index 2e6c713..ecee4da 100644
81  --- a/src/udev/udevd.c  --- a/src/udev/udevd.c
82  +++ b/src/udev/udevd.c  +++ b/src/udev/udevd.c
83  @@ -407,7 +407,7 @@ out:  @@ -416,7 +416,7 @@ out:
84           }           }
85   }   }
86    
# Line 89  index f882cfb..a07da35 100644 Line 89  index f882cfb..a07da35 100644
89           struct udev_list_node *loop;           struct udev_list_node *loop;
90    
91           udev_list_node_foreach(loop, &worker_list) {           udev_list_node_foreach(loop, &worker_list) {
92  @@ -432,7 +432,7 @@ static void event_run(struct event *event) {  @@ -442,7 +442,7 @@ static void event_run(struct event *event) {
93                   return;                   return;
94           }           }
95    
96  -        if (children >= children_max) {  -        if (children >= arg_children_max) {
97  +        if (!force && children >= children_max) {  +        if (!force && children >= arg_children_max) {
98                   if (children_max > 1)                   if (arg_children_max > 1)
99                           log_debug("maximum number (%i) of children reached", children);                           log_debug("maximum number (%i) of children reached", children);
100                   return;                   return;
101  @@ -468,6 +468,13 @@ static int event_queue_insert(struct udev_device *dev) {  @@ -474,6 +474,13 @@ static int event_queue_insert(struct udev_device *dev) {
102    
103           event->state = EVENT_QUEUED;           event->state = EVENT_QUEUED;
104           udev_list_node_append(&event->node, &event_list);           udev_list_node_append(&event->node, &event_list);
# Line 122  index f882cfb..a07da35 100644 Line 122  index f882cfb..a07da35 100644
122   }   }
123    
124  --  --
125  1.9.2  2.1.2
126    
Legend:
Removed from v.794632  
changed lines
  Added in v.794633
  ViewVC Help
Powered by ViewVC 1.1.30