Attachment 186601 Details for Bug 212922 – patch to cause modprobe to not block

[patch] patch to cause modprobe to not block

module-init-tools-modprobe-nowait.patch (text/plain), 2.78 KB, created by Neil Horman on 2007-09-04 20:33:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2007-09-04 20:33:15 UTC

Size: 2.78 KB

patch

obsolete

>diff -up module-init-tools-3.1-pre5/modprobe.c.orig module-init-tools-3.1-pre5/modprobe.c
>--- module-init-tools-3.1-pre5/modprobe.c.orig	2007-09-03 14:21:16.000000000 -0400
>+++ module-init-tools-3.1-pre5/modprobe.c	2007-09-03 14:22:12.000000000 -0400
>@@ -815,7 +815,8 @@ static void rmmod(struct list_head *list
> 		  int verbose,
> 		  struct module_command *commands,
> 		  int ignore_commands,
>-		  int ignore_inuse)
>+		  int ignore_inuse,
>+		  int flags)
> {
> 	const char *command;
> 	unsigned int usecount = 0;
>@@ -855,7 +856,7 @@ static void rmmod(struct list_head *list
> 	if (dry_run)
> 		goto remove_rest;
> 
>-	if (delete_module(name, O_EXCL) != 0) {
>+	if (delete_module(name, flags | O_EXCL) != 0) {
> 		if (errno == ENOENT)
> 			goto nonexistent_module;
> 		error("Error removing %s (%s): %s\n",
>@@ -869,7 +870,7 @@ static void rmmod(struct list_head *list
> 	/* Now do things we depend. */
> 	if (!list_empty(list))
> 		rmmod(list, NULL, 0, warn, dry_run, verbose, commands,
>-		      0, 1);
>+		      0, 1, flags);
> 	return;
> 
> nonexistent_module:
>@@ -1251,6 +1252,7 @@ int main(int argc, char *argv[])
> 	int strip_modversion = 0;
> 	int ignore_proc = 0;
> 	int first_time = 0;
>+	int flags = O_NONBLOCK;
> 	unsigned int i, num_modules;
> 	char *type = NULL;
> 	const char *config = NULL, *command = NULL;
>@@ -1272,7 +1274,7 @@ int main(int argc, char *argv[])
> 		try_old_version("modprobe", argv);
> 
> 	uname(&buf);
>-	while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aif", options, NULL)) != -1){
>+	while ((opt = getopt_long(argc, argv, "vVC:o:rknqQsclt:aifw", options, NULL)) != -1){
> 		switch (opt) {
> 		case 'v':
> 			add_to_env_var("-v");
>@@ -1354,6 +1356,9 @@ int main(int argc, char *argv[])
> 			strip_vermagic = 1;
> 			strip_modversion = 1;
> 			break;
>+		case 'w':
>+			flags &= ~(O_NONBLOCK);
>+			break;
> 		case 1:
> 			strip_vermagic = 1;
> 			break;
>@@ -1476,7 +1481,7 @@ int main(int argc, char *argv[])
> 
> 		if (remove)
> 			rmmod(&list, newname, first_time, error, dry_run,
>-			      verbose, commands, ignore_commands, 0);
>+			      verbose, commands, ignore_commands, 0, flags);
> 		else
> 			insmod(&list, NOFAIL(strdup(optstring)), newname,
> 			       first_time, error, dry_run, verbose, modoptions,
>diff -up module-init-tools-3.1-pre5/modprobe.8.orig module-init-tools-3.1-pre5/modprobe.8
>--- module-init-tools-3.1-pre5/modprobe.8.orig	2007-09-03 14:22:30.000000000 -0400
>+++ module-init-tools-3.1-pre5/modprobe.8	2007-09-03 14:24:21.000000000 -0400
>@@ -108,6 +108,10 @@ There is usually no reason to remove mod
> buggy modules require it.  Your kernel may not support
> removal of modules.
> .TP
>+\fB-w \fR
>+Wait for module reference count to be zero.  Default is to exit with an error
>+if the reference count is non-zero
>+.TP
> \fB-V --version \fR
> Show version of program, and exit.  See below for caveats when run on older kernels.
> .TP

Actions: View | Diff

Attachments on bug 212922: 159071 | 159072 | 159567 | 159568 | 159571 | 160770 | 160787 | 169395 | 174041 | 174261 | 176401 | 183901 | 183921 | 184891 | 186411 | 186601