Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit ae3cef73 authored May 31, 2012 by Boaz Harrosh Committed by Linus Torvalds May 31, 2012

kmod: unexport call_usermodehelper_freeinfo()



call_usermodehelper_freeinfo() is not used outside of kmod.c.  So unexport
it, and make it static to kmod.c

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent f0aac616

include/linux/kmod.h

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -79,10 +79,6 @@ void call_usermodehelper_setfns(struct subprocess_info *info,
	/* Actually execute the sub-process */		/* Actually execute the sub-process */
	int call_usermodehelper_exec(struct subprocess_info *info, int wait);		int call_usermodehelper_exec(struct subprocess_info *info, int 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		static inline int
	call_usermodehelper_fns(char path, char argv, char *envp, int wait,		call_usermodehelper_fns(char path, char argv, char *envp, int wait,
	int (init)(struct subprocess_info info, struct cred *new),		int (init)(struct subprocess_info info, struct cred *new),

kernel/kmod.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -221,13 +221,12 @@ fail:
	return 0;		return 0;
	}		}

	void call_usermodehelper_freeinfo(struct subprocess_info *info)		static void call_usermodehelper_freeinfo(struct subprocess_info *info)
	{		{
	if (info->cleanup)		if (info->cleanup)
	(*info->cleanup)(info);		(*info->cleanup)(info);
	kfree(info);		kfree(info);
	}		}
	EXPORT_SYMBOL(call_usermodehelper_freeinfo);

	static void umh_complete(struct subprocess_info *sub_info)		static void umh_complete(struct subprocess_info *sub_info)
	{		{