From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AF1AC3815B for ; Mon, 20 Apr 2020 12:56:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B805206D5 for ; Mon, 20 Apr 2020 12:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587387367; bh=Rh5hxvpqpcpQpqS+P4DEnb+HnabaCbgXcvHCZKbP88Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IbPGi3oXM+jQMN3+VYc3w8I7cxZbkatOAqyblSn8sTcPyaTTqAulcYJk9BIRQHgTb peaOKMA2XOLAL9pt8/EM9Z7XWoUJ1b09ryDQ1Xq8sUpQL06qHEy91a00Zqecp+bOOS in9BMWYtvpVoT1BTF53NhsVDYV4oHD7+y+a6Fv3M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728707AbgDTMpU (ORCPT ); Mon, 20 Apr 2020 08:45:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:39750 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727009AbgDTMpT (ORCPT ); Mon, 20 Apr 2020 08:45:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5C7EA206DD; Mon, 20 Apr 2020 12:45:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386718; bh=Rh5hxvpqpcpQpqS+P4DEnb+HnabaCbgXcvHCZKbP88Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N6KYTB8CNfrKWpDAleR4iOu/Ntca/rVgzexFlLGlujsRRTiy+68BAZfokY4bS+MtW 4nssdBdXaQXoZ62bo/4+1rNvZbIKAb3HpSTfTlKa9dYeoQqNSiF5zZFuxo3qTt4VHc d+LF95+sKz1+NX+h2QI8xnVZu470SlpAluqiVXow= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rahul Kundu , Maurizio Lombardi , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.6 71/71] scsi: target: iscsi: calling iscsit_stop_session() inside iscsit_close_session() has no effect Date: Mon, 20 Apr 2020 14:39:25 +0200 Message-Id: <20200420121522.825413903@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121508.491252919@linuxfoundation.org> References: <20200420121508.491252919@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Maurizio Lombardi [ Upstream commit 626bac73371eed79e2afa2966de393da96cf925e ] iscsit_close_session() can only be called when nconn is zero (otherwise a kernel panic is triggered). If nconn is zero then iscsit_stop_session() does nothing and exits, so calling it makes no sense. We still need to call iscsit_check_session_usage_count() because this function will sleep if the session's refcount is not zero and we don't want to destroy the session structure if it's still being referenced. Link: https://lore.kernel.org/r/20200313170656.9716-4-mlombard@redhat.com Tested-by: Rahul Kundu Signed-off-by: Maurizio Lombardi Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/target/iscsi/iscsi_target.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 09e55ea0bf5d5..9fc7e374a29b4 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -4368,8 +4368,7 @@ int iscsit_close_session(struct iscsi_session *sess) * restart the timer and exit. */ if (!in_interrupt()) { - if (iscsit_check_session_usage_count(sess) == 1) - iscsit_stop_session(sess, 1, 1); + iscsit_check_session_usage_count(sess); } else { if (iscsit_check_session_usage_count(sess) == 2) { atomic_set(&sess->session_logout, 0); -- 2.20.1