From patchwork Fri Jun 15 21:41:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 10467707 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4CB3D600F4 for ; Fri, 15 Jun 2018 21:42:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F0F228EA3 for ; Fri, 15 Jun 2018 21:42:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33E8728EA5; Fri, 15 Jun 2018 21:42:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A631228EA3 for ; Fri, 15 Jun 2018 21:42:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756564AbeFOVmJ (ORCPT ); Fri, 15 Jun 2018 17:42:09 -0400 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:27566 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756429AbeFOVmE (ORCPT ); Fri, 15 Jun 2018 17:42:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1529099942; x=1560635942; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Ymh+78yboopFWy6vQ9bbPrbX2L4N21psBvnBkE2ACgs=; b=Khunpfv7GF0Vku9zRAvaZcZSVk1obo38ruxj28LVt+VpANecP4RkI+un wzwBE+VxCYPW2jL/tLZj24sCF7L0vaAVxWzKHxJw3EdboDM48h5enAXqx gqkUxEvseLvOn7nWmNKpMYiArrwGo8ncSs/2IUdN9mxsTwZ39TCb8jubv 3uPrTcRdmMxncbeg7cslqSANcdYM637EaEWUJl+VzuVFw2A+mP6aUYv9T 2QnYS/C2PU/asxtJ8Lt3eQSVs4C1+jeT0t3yl62i5FZZkz5XHXiJ5NwSS S4/AM6XOMxBvYLll+BqHlA+CzGS//aZ4aO9JV/ls0ydupqlTTayB3pjC4 A==; X-IronPort-AV: E=Sophos;i="5.51,228,1526313600"; d="scan'208";a="177509055" Received: from h199-255-45-15.hgst.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 16 Jun 2018 05:59:01 +0800 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep02.wdc.com with ESMTP; 15 Jun 2018 14:31:45 -0700 Received: from thinkpad-bart.sdcorp.global.sandisk.com ([10.111.67.248]) by uls-op-cesaip02.wdc.com with ESMTP; 15 Jun 2018 14:42:03 -0700 From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Christoph Hellwig , Sathya Prakash , Chaitra P B , Suganath Prabu Subramani , stable@vger.kernel.org Subject: [PATCH v2 5/8] mpt3sas: Fix _transport_smp_handler() error path Date: Fri, 15 Jun 2018 14:41:58 -0700 Message-Id: <20180615214201.25365-6-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180615214201.25365-1-bart.vanassche@wdc.com> References: <20180615214201.25365-1-bart.vanassche@wdc.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch avoids that smatch complains about a double unlock on ioc->transport_cmds.mutex. Fixes: 651a01364994 ("scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough") Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Sathya Prakash Cc: Chaitra P B Cc: Suganath Prabu Subramani Cc: stable@vger.kernel.org Reviewed-by: Christoph Hellwig --- drivers/scsi/mpt3sas/mpt3sas_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c index 05d506d78c66..f4b02dd7f6cf 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_transport.c +++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c @@ -1936,12 +1936,12 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, pr_info(MPT3SAS_FMT "%s: host reset in progress!\n", __func__, ioc->name); rc = -EFAULT; - goto out; + goto job_done; } rc = mutex_lock_interruptible(&ioc->transport_cmds.mutex); if (rc) - goto out; + goto job_done; if (ioc->transport_cmds.status != MPT3_CMD_NOT_USED) { pr_err(MPT3SAS_FMT "%s: transport_cmds in use\n", ioc->name, @@ -2066,6 +2066,7 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, out: ioc->transport_cmds.status = MPT3_CMD_NOT_USED; mutex_unlock(&ioc->transport_cmds.mutex); +job_done: bsg_job_done(job, rc, reslen); }