From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934825AbeE1WBL (ORCPT ); Mon, 28 May 2018 18:01:11 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36204 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934453AbeE1V6J (ORCPT ); Mon, 28 May 2018 17:58:09 -0400 X-Google-Smtp-Source: ADUXVKI8HiYekE2Y8tAGAGoXPeOJAokCgdUaX5n3F2UU9GzfZFQWd+vnFj+g+cwBN9SkK2PdATeTSg== From: Christian Brauner To: linux-kernel@vger.kernel.org Cc: ebiederm@xmission.com, gregkh@linuxfoundation.org, mingo@kernel.org, james.morris@microsoft.com, keescook@chromium.org, peterz@infradead.org, sds@tycho.nsa.gov, viro@zeniv.linux.org.uk, akpm@linux-foundation.org, oleg@redhat.com, Christian Brauner Subject: [PATCH v1 06/20] signal: drop else branch in do_signal_stop() Date: Mon, 28 May 2018 23:53:41 +0200 Message-Id: <20180528215355.16119-7-christian@brauner.io> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180528215355.16119-1-christian@brauner.io> References: <20180528215355.16119-1-christian@brauner.io> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org do_signal_stop() already returns in the if branch so there's no need to keep the else branch around. Signed-off-by: Christian Brauner --- v0->v1: * patch unchanged --- kernel/signal.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/signal.c b/kernel/signal.c index a628b56415e6..d1914439f144 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2214,14 +2214,14 @@ static bool do_signal_stop(int signr) /* Now we don't run again until woken by SIGCONT or SIGKILL */ freezable_schedule(); return true; - } else { - /* - * While ptraced, group stop is handled by STOP trap. - * Schedule it and let the caller deal with it. - */ - task_set_jobctl_pending(current, JOBCTL_TRAP_STOP); - return false; } + + /* + * While ptraced, group stop is handled by STOP trap. + * Schedule it and let the caller deal with it. + */ + task_set_jobctl_pending(current, JOBCTL_TRAP_STOP); + return false; } /** -- 2.17.0