Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756314AbbBECee (ORCPT ); Wed, 4 Feb 2015 21:34:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42103 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751360AbbBECeb (ORCPT ); Wed, 4 Feb 2015 21:34:31 -0500 Subject: [RFC PATCH 4/8] KEYS - rename call_usermodehelper_keys() 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:18 +0800 Message-ID: <20150205023417.8382.9801.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: 1631 Lines: 46 The wait parameter of call_usermodehelper_keys() 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 --- security/keys/request_key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 0c7aea4..9e79bbf 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -73,7 +73,7 @@ static void umh_keys_cleanup(struct subprocess_info *info) * Call a usermode helper with a specific session keyring. */ static int call_usermodehelper_keys(char *path, char **argv, char **envp, - struct key *session_keyring, int wait) + struct key *session_keyring, int flags) { struct subprocess_info *info; @@ -84,7 +84,7 @@ static int call_usermodehelper_keys(char *path, char **argv, char **envp, return -ENOMEM; key_get(session_keyring); - return call_usermodehelper_exec(info, wait); + return call_usermodehelper_exec(info, flags); } /* -- 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/