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 <[email protected]> Cc: Benjamin Coddington <[email protected]> Cc: Al Viro <[email protected]> Cc: J. Bruce Fields <[email protected]> Cc: David Howells <[email protected]> Cc: Trond Myklebust <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Eric W. Biederman <[email protected]> Cc: Jeff Layton <[email protected]> --- 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
