Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161668AbbBECeU (ORCPT ); Wed, 4 Feb 2015 21:34:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42454 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161239AbbBECeS (ORCPT ); Wed, 4 Feb 2015 21:34:18 -0500 Subject: [RFC PATCH 2/8] kmod - rename call_usermodehelper() flags parameter From: Ian Kent To: Kernel Mailing List Cc: David Howells , Oleg Nesterov , Trond Myklebust , "J. Bruce Fields" , Benjamin Coddington , Al Viro , Jeff Layton , "Eric W. Biederman" Date: Thu, 05 Feb 2015 10:34:04 +0800 Message-ID: <20150205023404.8382.41937.stgit@pluto.fritz.box> In-Reply-To: <20150205021553.8382.16297.stgit@pluto.fritz.box> References: <20150205021553.8382.16297.stgit@pluto.fritz.box> User-Agent: StGit/0.17-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3767 Lines: 101 The wait parameter of call_usermodehelper() is not quite a parameter that describes the wait behaviour alone and will later be used to request exec within a namespace. So change its name to flags. Signed-off-by: Ian Kent Cc: Benjamin Coddington Cc: Al Viro Cc: J. Bruce Fields Cc: David Howells Cc: Trond Myklebust Cc: Oleg Nesterov Cc: Eric W. Biederman Cc: Jeff Layton --- include/linux/kmod.h | 4 ++-- kernel/kmod.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/linux/kmod.h b/include/linux/kmod.h index 0555cc6..15bdeed 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -67,7 +67,7 @@ struct subprocess_info { }; extern int -call_usermodehelper(char *path, char **argv, char **envp, int wait); +call_usermodehelper(char *path, char **argv, char **envp, int flags); extern struct subprocess_info * call_usermodehelper_setup(char *path, char **argv, char **envp, gfp_t gfp_mask, @@ -75,7 +75,7 @@ call_usermodehelper_setup(char *path, char **argv, char **envp, gfp_t gfp_mask, void (*cleanup)(struct subprocess_info *), void *data); extern int -call_usermodehelper_exec(struct subprocess_info *info, int wait); +call_usermodehelper_exec(struct subprocess_info *info, int flags); extern struct ctl_table usermodehelper_table[]; diff --git a/kernel/kmod.c b/kernel/kmod.c index 2777f40..14c0188 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -534,7 +534,7 @@ EXPORT_SYMBOL(call_usermodehelper_setup); * asynchronously if wait is not set, and runs as a child of keventd. * (ie. it runs with full root capabilities). */ -int call_usermodehelper_exec(struct subprocess_info *sub_info, int wait) +int call_usermodehelper_exec(struct subprocess_info *sub_info, int flags) { DECLARE_COMPLETION_ONSTACK(done); int retval = 0; @@ -553,14 +553,14 @@ int call_usermodehelper_exec(struct subprocess_info *sub_info, int wait) * This makes it possible to use umh_complete to free * the data structure in case of UMH_NO_WAIT. */ - sub_info->complete = (wait == UMH_NO_WAIT) ? NULL : &done; - sub_info->wait = wait; + sub_info->complete = (flags == UMH_NO_WAIT) ? NULL : &done; + sub_info->wait = flags; queue_work(khelper_wq, &sub_info->work); - if (wait == UMH_NO_WAIT) /* task has freed sub_info */ + if (flags == UMH_NO_WAIT) /* task has freed sub_info */ goto unlock; - if (wait & UMH_KILLABLE) { + if (flags & UMH_KILLABLE) { retval = wait_for_completion_killable(&done); if (!retval) goto wait_done; @@ -595,17 +595,17 @@ EXPORT_SYMBOL(call_usermodehelper_exec); * This function is the equivalent to use call_usermodehelper_setup() and * call_usermodehelper_exec(). */ -int call_usermodehelper(char *path, char **argv, char **envp, int wait) +int call_usermodehelper(char *path, char **argv, char **envp, int flags) { struct subprocess_info *info; - gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; + gfp_t gfp_mask = (flags == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; info = call_usermodehelper_setup(path, argv, envp, gfp_mask, NULL, NULL, NULL); if (info == NULL) return -ENOMEM; - return call_usermodehelper_exec(info, wait); + return call_usermodehelper_exec(info, flags); } EXPORT_SYMBOL(call_usermodehelper); -- 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/