Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754599Ab0AECQ5 (ORCPT ); Mon, 4 Jan 2010 21:16:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754437Ab0AECPe (ORCPT ); Mon, 4 Jan 2010 21:15:34 -0500 Received: from one.firstfloor.org ([213.235.205.2]:43073 "EHLO one.firstfloor.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754214Ab0AECPb (ORCPT ); Mon, 4 Jan 2010 21:15:31 -0500 From: Andi Kleen References: <20100105315.789846878@firstfloor.org> In-Reply-To: <20100105315.789846878@firstfloor.org> To: ebiederm@xmission.com, paulmck@linux.vnet.ibm.com, akpm@linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] [5/9] SYSCTL: Add call_usermodehelper_cleanup() Message-Id: <20100105021530.3663CB17C2@basil.firstfloor.org> Date: Tue, 5 Jan 2010 03:15:30 +0100 (CET) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1815 Lines: 50 This is the same as call_usermodehelper(), but with an cleanup callback. Needed for some of the followon proc_rcu_string() users. This avoids open coding this. Signed-off-by: Andi Kleen --- include/linux/kmod.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Index: linux-2.6.33-rc2-ak/include/linux/kmod.h =================================================================== --- linux-2.6.33-rc2-ak.orig/include/linux/kmod.h +++ linux-2.6.33-rc2-ak/include/linux/kmod.h @@ -72,7 +72,8 @@ int call_usermodehelper_exec(struct subp void call_usermodehelper_freeinfo(struct subprocess_info *info); static inline int -call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait) +call_usermodehelper_cleanup(char *path, char **argv, char **envp, enum umh_wait wait, + void (*cleanup)(char **, char **)) { struct subprocess_info *info; gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; @@ -80,10 +81,18 @@ call_usermodehelper(char *path, char **a info = call_usermodehelper_setup(path, argv, envp, gfp_mask); if (info == NULL) return -ENOMEM; + if (cleanup) + call_usermodehelper_setcleanup(info, cleanup); return call_usermodehelper_exec(info, wait); } static inline int +call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait) +{ + return call_usermodehelper_cleanup(path, argv, envp, wait, NULL); +} + +static inline int call_usermodehelper_keys(char *path, char **argv, char **envp, struct key *session_keyring, enum umh_wait wait) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/