leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kmod: always provide usermodehelper_disable()

Browse Source 
We need to prevent kernel-forked processes during system poweroff.
Such processes try to access the filesystem whose disks we are
trying to shutdown at the same time. This causes delays and exceptions
in the storage drivers.

A follow-up patch will add these calls and need usermodehelper_disable()
also on systems without suspend support.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Kay Sievers 2011-05-10 21:27:34 +02:00 committed by Rafael J. Wysocki
parent c3b0795c98
commit 13d53f8775
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/kmod.h
View File

@ -111,12 +111,8 @@ call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait)
extern void usermodehelper_init(void); extern void usermodehelper_init(void);
#ifdef CONFIG_PM_SLEEP
extern int usermodehelper_disable(void); extern int usermodehelper_disable(void);
extern void usermodehelper_enable(void); extern void usermodehelper_enable(void);
extern bool usermodehelper_is_disabled(void); extern bool usermodehelper_is_disabled(void);
#else
static inline bool usermodehelper_is_disabled(void) { return false; }
#endif
#endif /* __LINUX_KMOD_H__ */ #endif /* __LINUX_KMOD_H__ */

7
kernel/kmod.c
View File

@ -245,7 +245,6 @@ static void __call_usermodehelper(struct work_struct *work)
} }
} }
#ifdef CONFIG_PM_SLEEP
/* /*
* If set, call_usermodehelper_exec() will exit immediately returning -EBUSY * If set, call_usermodehelper_exec() will exit immediately returning -EBUSY
* (used for preventing user land processes from being created after the user * (used for preventing user land processes from being created after the user
@ -321,12 +320,6 @@ static void helper_unlock(void)
if (atomic_dec_and_test(&running_helpers)) if (atomic_dec_and_test(&running_helpers))
wake_up(&running_helpers_waitq); wake_up(&running_helpers_waitq);
} }
#else /* CONFIG_PM_SLEEP */
#define usermodehelper_disabled 0
static inline void helper_lock(void) {}
static inline void helper_unlock(void) {}
#endif /* CONFIG_PM_SLEEP */
/** /**
* call_usermodehelper_setup - prepare to call a usermode helper * call_usermodehelper_setup - prepare to call a usermode helper