aboutsummaryrefslogtreecommitdiff
path: root/modutils/modprobe.c
diff options
context:
space:
mode:
Diffstat (limited to 'modutils/modprobe.c')
-rw-r--r--modutils/modprobe.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 70c45903a..eeeff7609 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -235,10 +235,9 @@ static void add_probe(const char *name)
235 } 235 }
236} 236}
237 237
238static int FAST_FUNC config_file_action(const char *filename, 238static int FAST_FUNC config_file_action(struct recursive_state *state,
239 struct stat *statbuf UNUSED_PARAM, 239 const char *filename,
240 void *userdata UNUSED_PARAM, 240 struct stat *statbuf UNUSED_PARAM)
241 int depth)
242{ 241{
243 char *tokens[3]; 242 char *tokens[3];
244 parser_t *p; 243 parser_t *p;
@@ -255,7 +254,7 @@ static int FAST_FUNC config_file_action(const char *filename,
255 * that we shouldn't recurse into /etc/modprobe.d/dir/ 254 * that we shouldn't recurse into /etc/modprobe.d/dir/
256 * _subdirectories_: 255 * _subdirectories_:
257 */ 256 */
258 if (depth > 1) 257 if (state->depth > 1)
259 return SKIP; /* stop recursing */ 258 return SKIP; /* stop recursing */
260//TODO: instead, can use dirAction in recursive_action() to SKIP dirs 259//TODO: instead, can use dirAction in recursive_action() to SKIP dirs
261//on depth == 1 level. But that's more code... 260//on depth == 1 level. But that's more code...
@@ -264,7 +263,7 @@ static int FAST_FUNC config_file_action(const char *filename,
264 * depth==0: read_config("modules.{symbols,alias}") must work, 263 * depth==0: read_config("modules.{symbols,alias}") must work,
265 * "include FILE_NOT_ENDING_IN_CONF" must work too. 264 * "include FILE_NOT_ENDING_IN_CONF" must work too.
266 */ 265 */
267 if (depth != 0) { 266 if (state->depth != 0) {
268 if (!is_suffixed_with(base, ".conf")) 267 if (!is_suffixed_with(base, ".conf"))
269 goto error; 268 goto error;
270 } 269 }
@@ -329,8 +328,7 @@ static int FAST_FUNC config_file_action(const char *filename,
329static int read_config(const char *path) 328static int read_config(const char *path)
330{ 329{
331 return recursive_action(path, ACTION_RECURSE | ACTION_QUIET, 330 return recursive_action(path, ACTION_RECURSE | ACTION_QUIET,
332 config_file_action, NULL, NULL, 331 config_file_action, NULL, NULL);
333 /*depth:*/ 0);
334} 332}
335 333
336static const char *humanly_readable_name(struct module_entry *m) 334static const char *humanly_readable_name(struct module_entry *m)