Commit 97c18e2c authored Apr 09, 2009 by Herbert Xu Committed by Linus Torvalds Apr 09, 2009

module: try_then_request_module must wait



Since the whole point of try_then_request_module is to retry
the operation after a module has been loaded, we must wait for
the module to fully load.

Otherwise all sort of things start breaking, e.g., you won't
be able to read your encrypted disks on the first attempt.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Tested-by: Maciej Rutecki <maciej.rutecki@gmail.com>
Tested-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f4efdd65

include/linux/kmod.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ extern int __request_module(bool wait, const char *name, ...) \
		#define request_module(mod...) __request_module(true, mod)
		#define request_module_nowait(mod...) __request_module(false, mod)
		#define try_then_request_module(x, mod...) \
		((x) ?: (__request_module(false, mod), (x)))
		((x) ?: (__request_module(true, mod), (x)))
		#else
		static inline int request_module(const char *name, ...) { return -ENOSYS; }
		static inline int request_module_nowait(const char *name, ...) { return -ENOSYS; }

Admin message