[PATCH] Keys: Get rid of warning in kmod.c if keys disabled
The attached patch gets rid of a "statement without effect" warning when CONFIG_KEYS is disabled by making use of the return value of key_get(). The compiler will optimise all of this away when keys are disabled. Signed-Off-By: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
29db919063
Коммит
20e1129ab8
|
@ -131,14 +131,14 @@ struct subprocess_info {
|
|||
static int ____call_usermodehelper(void *data)
|
||||
{
|
||||
struct subprocess_info *sub_info = data;
|
||||
struct key *old_session;
|
||||
struct key *new_session, *old_session;
|
||||
int retval;
|
||||
|
||||
/* Unblock all signals and set the session keyring. */
|
||||
key_get(sub_info->ring);
|
||||
new_session = key_get(sub_info->ring);
|
||||
flush_signals(current);
|
||||
spin_lock_irq(¤t->sighand->siglock);
|
||||
old_session = __install_session_keyring(current, sub_info->ring);
|
||||
old_session = __install_session_keyring(current, new_session);
|
||||
flush_signal_handlers(current, 1);
|
||||
sigemptyset(¤t->blocked);
|
||||
recalc_sigpending();
|
||||
|
|
Загрузка…
Ссылка в новой задаче