86313c488a
Rather than using a tri-state integer for the wait flag in call_usermodehelper_exec, define a proper enum, and use that. I've preserved the integer values so that any callers I've missed should still work OK. Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: Randy Dunlap <randy.dunlap@oracle.com> Cc: Christoph Hellwig <hch@infradead.org> Cc: Andi Kleen <ak@suse.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Joel Becker <joel.becker@oracle.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Cc: Srivatsa Vaddagiri <vatsa@in.ibm.com> Cc: Oleg Nesterov <oleg@tv-sign.ru> Cc: David Howells <dhowells@redhat.com>
98 lines
3.1 KiB
C
98 lines
3.1 KiB
C
#ifndef __LINUX_KMOD_H__
|
|
#define __LINUX_KMOD_H__
|
|
|
|
/*
|
|
* include/linux/kmod.h
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/stddef.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/compiler.h>
|
|
|
|
#define KMOD_PATH_LEN 256
|
|
|
|
#ifdef CONFIG_KMOD
|
|
/* modprobe exit status on success, -ve on error. Return value
|
|
* usually useless though. */
|
|
extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2)));
|
|
#else
|
|
static inline int request_module(const char * name, ...) { return -ENOSYS; }
|
|
#endif
|
|
|
|
#define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x)))
|
|
|
|
struct key;
|
|
struct file;
|
|
struct subprocess_info;
|
|
|
|
/* Allocate a subprocess_info structure */
|
|
struct subprocess_info *call_usermodehelper_setup(char *path,
|
|
char **argv, char **envp);
|
|
|
|
/* Set various pieces of state into the subprocess_info structure */
|
|
void call_usermodehelper_setkeys(struct subprocess_info *info,
|
|
struct key *session_keyring);
|
|
int call_usermodehelper_stdinpipe(struct subprocess_info *sub_info,
|
|
struct file **filp);
|
|
void call_usermodehelper_setcleanup(struct subprocess_info *info,
|
|
void (*cleanup)(char **argv, char **envp));
|
|
|
|
enum umh_wait {
|
|
UMH_NO_WAIT = -1, /* don't wait at all */
|
|
UMH_WAIT_EXEC = 0, /* wait for the exec, but not the process */
|
|
UMH_WAIT_PROC = 1, /* wait for the process to complete */
|
|
};
|
|
|
|
/* Actually execute the sub-process */
|
|
int call_usermodehelper_exec(struct subprocess_info *info, enum umh_wait wait);
|
|
|
|
/* Free the subprocess_info. This is only needed if you're not going
|
|
to call call_usermodehelper_exec */
|
|
void call_usermodehelper_freeinfo(struct subprocess_info *info);
|
|
|
|
static inline int
|
|
call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait)
|
|
{
|
|
struct subprocess_info *info;
|
|
|
|
info = call_usermodehelper_setup(path, argv, envp);
|
|
if (info == NULL)
|
|
return -ENOMEM;
|
|
return call_usermodehelper_exec(info, wait);
|
|
}
|
|
|
|
static inline int
|
|
call_usermodehelper_keys(char *path, char **argv, char **envp,
|
|
struct key *session_keyring, enum umh_wait wait)
|
|
{
|
|
struct subprocess_info *info;
|
|
|
|
info = call_usermodehelper_setup(path, argv, envp);
|
|
if (info == NULL)
|
|
return -ENOMEM;
|
|
|
|
call_usermodehelper_setkeys(info, session_keyring);
|
|
return call_usermodehelper_exec(info, wait);
|
|
}
|
|
|
|
extern void usermodehelper_init(void);
|
|
|
|
struct file;
|
|
extern int call_usermodehelper_pipe(char *path, char *argv[], char *envp[],
|
|
struct file **filp);
|
|
|
|
#endif /* __LINUX_KMOD_H__ */
|