From patchwork Mon Jul 30 21:40:18 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: 10549647 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C22429093 for ; Mon, 30 Jul 2018 21:40:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B63AB2A99A for ; Mon, 30 Jul 2018 21:40:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA65D2A9EE; Mon, 30 Jul 2018 21:40:22 +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 43EA42A9B4 for ; Mon, 30 Jul 2018 21:40:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731845AbeG3XRQ (ORCPT ); Mon, 30 Jul 2018 19:17:16 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:63836 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731192AbeG3XRQ (ORCPT ); Mon, 30 Jul 2018 19:17:16 -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=1532986820; x=1564522820; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=6yO0gbXj6zDxqOo49s9vCKlQLngSwtHxJb5rnlSMV/U=; b=W4+EQR34mFrVEszE5ZhOgKB95kdyeeGLxQLOFc9cqn94vZWNmlH0DyQn T0tj3u4kqQVeAIYmrILu872V8kQJBNrJJvuqiofyHWZU9MFrRlzKFWgtx 8wugPMfRiR1rcwnc1nx3lAP7oyHZulHs0cM1i2xryr3EofkZEmfjvXR7/ wM+RW3PTze5F5vAVEnexcNQ6RrqlzM/CL4DxhzPUw2arRPEKFpzR3aFWJ 2IZzy/YwM9GLulIlpYGw6VPq3ZKWLP1oj2w99rpe1hGi0RiTqHafHp3cv EjUY6mgfS8MBxPLMywnIRm1PPtQ0Le0teZV3YLO2WKJJD3PPOoFLL2bwJ A==; X-IronPort-AV: E=Sophos;i="5.51,424,1526313600"; d="scan'208";a="189261076" 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; 31 Jul 2018 05:40:20 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP; 30 Jul 2018 14:28:12 -0700 Received: from thinkpad-bart.sdcorp.global.sandisk.com ([10.111.67.248]) by uls-op-cesaip01.wdc.com with ESMTP; 30 Jul 2018 14:40:20 -0700 From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Lee Duncan , Chris Leech Subject: [PATCH 1/2] libiscsi: Annotate locking assumptions Date: Mon, 30 Jul 2018 14:40:18 -0700 Message-Id: <20180730214019.20672-2-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180730214019.20672-1-bart.vanassche@wdc.com> References: <20180730214019.20672-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 sparse reports the following: drivers/scsi/libiscsi.c:1844:23: warning: context imbalance in 'iscsi_exec_task_mgmt_fn' - unexpected unlock Signed-off-by: Bart Van Assche Signed-off-by: Lee Duncan Signed-off-by: Chris Leech --- drivers/scsi/libiscsi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index d6093838f5f2..b36bafd5a058 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1832,6 +1832,7 @@ static void iscsi_tmf_timedout(struct timer_list *t) static int iscsi_exec_task_mgmt_fn(struct iscsi_conn *conn, struct iscsi_tm *hdr, int age, int timeout) + __must_hold(&session->frwd_lock) { struct iscsi_session *session = conn->session; struct iscsi_task *task; From patchwork Mon Jul 30 21:40:19 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: 10549649 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB89B14E2 for ; Mon, 30 Jul 2018 21:40:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDC252A9B4 for ; Mon, 30 Jul 2018 21:40:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D24312A98D; Mon, 30 Jul 2018 21:40:22 +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 6EC672A98D for ; Mon, 30 Jul 2018 21:40:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731864AbeG3XRR (ORCPT ); Mon, 30 Jul 2018 19:17:17 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:63836 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726872AbeG3XRQ (ORCPT ); Mon, 30 Jul 2018 19:17:16 -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=1532986820; x=1564522820; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=o8Ln0Jl3LwG+jEBr7rCAEFwjGPnRdDuaQ0l36ov9hYc=; b=L0cDQdyLIJ9fLlEpRRh4ENZ4zHIS69nO64gSvuUrn0t9uNPy1Iz5T5q3 j9Uhgpk3+VI+Tw49Lu0oA8/GgOpdaS/fkawe8vINmwq8tfmLB5pqkF0+y 7Y7/9b2WtFDWcZzGf2lB4LK18oZymEfakf8gXsRw99Lw68zvVgTKN2Tsn AI4K6xgypeCf9FSwu58itQQb6RSoHPtLD4nhGKiCoeqF6pqrE+zK5HjAS z7T1fQJcQ4x1Msxybq0YbMwguV0ITHE/DeMIBp4+/isuEi2S5/51Qq2kV VjnorkpF/rUz32SajFpnBpW3ksYYYImz2yHyCCCu2FB/suWklYJVqfz20 A==; X-IronPort-AV: E=Sophos;i="5.51,424,1526313600"; d="scan'208";a="189261078" 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; 31 Jul 2018 05:40:20 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP; 30 Jul 2018 14:28:12 -0700 Received: from thinkpad-bart.sdcorp.global.sandisk.com ([10.111.67.248]) by uls-op-cesaip01.wdc.com with ESMTP; 30 Jul 2018 14:40:21 -0700 From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Lee Duncan , Chris Leech Subject: [PATCH 2/2] libiscsi: Annotate fall-through Date: Mon, 30 Jul 2018 14:40:19 -0700 Message-Id: <20180730214019.20672-3-bart.vanassche@wdc.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180730214019.20672-1-bart.vanassche@wdc.com> References: <20180730214019.20672-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 building with W=1 causes the compiler to complain about fall-through. Signed-off-by: Bart Van Assche Cc: Lee Duncan Cc: Chris Leech --- drivers/scsi/libiscsi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index b36bafd5a058..d5f2f368040f 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1705,6 +1705,7 @@ int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc) sc->result = DID_NO_CONNECT << 16; break; } + /* fall through */ case ISCSI_STATE_IN_RECOVERY: reason = FAILURE_SESSION_IN_RECOVERY; sc->result = DID_IMM_RETRY << 16;