From patchwork Wed Aug 23 22:04:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9918477 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 A6FCF600C5 for ; Wed, 23 Aug 2017 22:05:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9979D28A39 for ; Wed, 23 Aug 2017 22:05:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E53528A74; Wed, 23 Aug 2017 22:05:34 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI 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 E594828A39 for ; Wed, 23 Aug 2017 22:05:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751092AbdHWWFd (ORCPT ); Wed, 23 Aug 2017 18:05:33 -0400 Received: from mail-sn1nam01on0073.outbound.protection.outlook.com ([104.47.32.73]:2112 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750945AbdHWWFb (ORCPT ); Wed, 23 Aug 2017 18:05:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=rkVfecjd0WqHD60Kr+sZ7qoqcgyBJnI0vMMCCQFubl0=; b=AiaTd6EE4bNaIxAVCJRTeEInyz84FfR4B41toKjnVAFY+oEWWasfMjnLRuiGSLsa6MrHdHIGbndjqftQzdAlUm5manKy/++8OTeCBhkXmIfmWezHWDDRJQ8ZnTh7j1Gfb5Jyjb3xb0dXxbTHzCPYiH+vIOeEHrlc6X1+rIVyTHs= Received: from SN4PR0701CA0011.namprd07.prod.outlook.com (2603:10b6:803:28::21) by SN2PR07MB2528.namprd07.prod.outlook.com (2603:10b6:804:7::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Wed, 23 Aug 2017 22:05:29 +0000 Received: from BL2FFO11OLC011.protection.gbl (2a01:111:f400:7c09::124) by SN4PR0701CA0011.outlook.office365.com (2603:10b6:803:28::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21 via Frontend Transport; Wed, 23 Aug 2017 22:05:30 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11OLC011.mail.protection.outlook.com (10.173.160.157) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.1341.15 via Frontend Transport; Wed, 23 Aug 2017 22:05:29 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Wed, 23 Aug 2017 15:05:25 -0700 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id v7NM5PF6003154; Wed, 23 Aug 2017 15:05:25 -0700 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v7NM5PID003153; Wed, 23 Aug 2017 15:05:25 -0700 From: Himanshu Madhani To: , CC: , Subject: [PATCH 01/31] qla2xxx: Correction to vha->vref_count timeout Date: Wed, 23 Aug 2017 15:04:55 -0700 Message-ID: <20170823220525.3115-2-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170823220525.3115-1-himanshu.madhani@cavium.com> References: <20170823220525.3115-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(86362001)(106466001)(50226002)(105586002)(5003940100001)(54906002)(42186005)(2950100002)(101416001)(5660300001)(8936002)(2906002)(72206003)(48376002)(87636003)(478600001)(50466002)(189998001)(6666003)(33646002)(4326008)(76176999)(305945005)(81156014)(626005)(36756003)(69596002)(47776003)(1076002)(8676002)(356003)(81166006)(50986999)(80596001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR07MB2528; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC011; 1:GoDIvhx7DX6RyYOWrksBlI1La6si6AAJZzmzeDam4VR28Q4DgzEoW9UDx1MtJrlA838/ZPNM+UWUcZE3qFZkKee2y4V5VcsKQxgb/7DdOQDxRWAkHzT0dBCjM0rcMUIq X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9d950e67-f377-4deb-c3b1-08d4ea731137 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(2017052603190)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN2PR07MB2528; X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2528; 3:Fxkj3ibH4N9L+Idrk8zk87FBs7J7/jgNbCNSlU/HXiqVGm+xCwrNaDjWZ52ScDDsTREQDDAQHQfF6vrmD9sZa5fnrClqT+lQGXGfkJ4qadrDUwq/ElRI+qt2ZwbQes04wPAxpkzs0LUma/cLqb/6GkcanF8Qu9DVbBZyOwEuWPvpqkeWCg+dsROIh/LXGWOpl6/jvJkalTPgDQp6KgYuWQKyZngbiq/imAW4ICK8x7GtzcjczhEHJilk4BiCH0J8+30tI7jFVjdre2ZfoX+XLLECN2uiKtwPnr9984bzFmHcdBQu/pQBcVFbzkp7gfPJ2i8Al4hMCJrkWTnv5fnmhw==; 25:t7y5W4BSFiBwzhuj8k+OFMR8yP9dxMFIXI1nEiZzu2wh175o0yd8EUzPDIr7ML0tZoPqyvaPdty4PFaH0s7HCqZRc0TtNNkwi6WnfTPSNJZBF7MY8qKqaOQz1vU9tSZgVaZ4aQeOD+R0pywB1dTQPUBCQfE3exZr2L/QTyXWGrU3/a0TSZHkrZPaleot/NPFgb09karaemM//2WZM3NWBqIKraUcV0geiQ2Vylolon7YvBO+e9Pw1MQmkFvfPw+1kYUnPzzz4Rls+uY0rqcK5zXRMYqCvgpDNRDE4bGsz0RZ5+0dKAn6KT9cvtMPiq+wfvS9JLYveZ6Jv1JPOgPdVw==; 31:mOAvda8k7vSqyQbqSnAITG000BMuDkLJ+rw78l5nIlaZ9SlSFtVPl3MsvsDhu6nKQTu+CiOXMqUlPcOtx+5ScYnhvXB56gap5vvSElY90qFx118+5z+j1u8iTY3Suk2Y+vcGgLJJqamAEecWDGzrZQ7UdKJ79l7RGS9vk6POMkP5hBiv7BPuG+VAN6x4Vc+z9CfEpLepQAAkP/oI9clZA+GT1Swqce68Zp+gZ3sIt+U= X-MS-TrafficTypeDiagnostic: SN2PR07MB2528: X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2528; 20:sw8NKtQ2F1hqGqIaXjfmAyf1EyLGi09t+rmlPKjABir66k83x2DQ490qz2wMXII3Q3e477jerXCDndhLP7rhOxuANINbvSss5ZUW7wnwnBV7D/AT45Iqb5rdS20AGXVqEbJlf+Xr3taumCaAgmyixLMCJ4Y7hAdMkVFjBEC43t1iCb0o4XEgARKnZWtYUpv1k4XpSTPEpqHtztyPboaKmc7nPefBkcMbahn9z2Ml9bp2Re8ogrqLB0r1x1QgyBzFbhL+7bH/POFegBecoV6Cdc0N8hTn+HjcDKbES1qtIobmkw04kosJ1HdAs5VdLJNOq0WdbnV4KEsGQLl1tCaLrdg8URrTJBz5xuqN9T/eN/sjxwEFu16UN4Oo1l1RvaL5eAaV+VkEAYWjRtfrBqnadH9mC/G/tBowHkl60OWdr0HUxohjfzKmyNzjJqZBt0Rdi5QkEwiBZPrwvOTG8+v6d1ucCcyEpUfjrbNndMTSXblbx1VBhNx4n4AR6X2Qjfo/; 4:O8SSEHxNBp7+breqfUyjlKWTG3znnPIzDeqfCzxdWbqQ1mT6C7uzm40QMXe6sVwAvE4OwMpkq0AHDMZPj8PP8lDb1tWCjM4yjzu4RDC9Icnqn6Hv8x6F4nYFlie3Xte//Kq3QvKd8Et601Fuj3xmWMG+iTF+hVfNxX7VK7F1XVn6Me73klGQ44w/lcvCph+7KwNenNdzqzY9n6ZkJjIEd/hSw2sbQH6AmHCFKK7NVIZSX836a0+qfP2CGxenMVzKdFcBvx36Lcmm4nV2jlkDPa01sSszsC4kpsxMdNIkTnE= X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13016025)(5005006)(8121501046)(13018025)(3002001)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(6041248)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN2PR07MB2528; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN2PR07MB2528; X-Forefront-PRVS: 040866B734 X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2528; 23:t+5xXMqixtNvOY93nyxIlHzQE3nhxvu0DtJiG7NrRsTycd9xuWmy31R3pmSYyxjkaynzuSELb/kLo31SSg/Wt71riKtXpQdWOyCElFHZMG9KkM9ZIjl6BTF9MIwnbsaP8m3T1Ba2GbGYjcThiEQ2BKY8rpWuJX+P7cB3gVaWVZE3oNt6cMlBDn6JThKEq7jX6F/Cd5isttFqpYu7vxI614z8avzNddaafNxpFFcAMgx74NT6LDSVxWfgNSr1xe2udcAsvNjWCavs/6q5GWLn2dNVmnp1b/jhk7AGF+YQyzOSPoOKKexEKqEVDmkmV7CuzONcOtf8sLwFXsdQiRVHFzVPcFfL4VcOn+5TEJpPUrudlArbftMMKuDKdpr5EoPAuIkp3RXugLNu8zW2EY+owpACIGevcymWBmr0mQ8O4jQ+Pb6B85XN4uDaBvE3p0BqNS/NP+5/Y47G0Z3scoWnw05xoKJwjpNi7VaiaD08XiptFoT7hkdW1XrHvfnXt7kQX7ygsV6U8Yv3YGKSuGXBrlkLXy9LAEbvAgS/k8+eeqOj61NENEQ1ESIeqlmufShdb2AJDkMsYjlogNp3o6WFrsdwKSOvuNqz2z+r9hhogu+joabkZMLZl14cY+qMrMjfoEElu+iesD/1G/jptuJcixgD30ZUi7uVIaDqnDQSDEgQDGua6agNRaXHJ00JmA3rPPmNEnzJp5Gso6q3GdmmO6ivAzEwf7i7MDJSaUBbzmbfMAG22LQmrpxZE9YjyTPWLfXHpEmoVeUme3a5JK5OTkQccqmmLyGVqC8tZP1QqXwgZ3vvAlWTQMSGYxSWkJD1Xa0ZhkBXDWeq6dMUXnmgjgE9qjW/4HM4V9co/O08W30jI/RwgndxVJx4vmhzDlfvZUQY1xAh3OFPNxf1A7SRPBhusmNvgiM9+MKTir2oZ 86XfpB8bTKTnow3ArA0Awpm X-Microsoft-Exchange-Diagnostics: 1; SN2PR07MB2528; 6:TrmNttw0+9JCwkjaEmBw5XvXE+g5XDWOHtXbs4AtCLkP8JD+FW8MTWKjnJOzfzSjvns8rm3+/XyKbcM/Iiy/XJ28NE/xuJqtHeNwE8CHZhQg9LwnvSXlBphe2KXiFE8nN4JnjCGG3YQLLPcIQIJaKp2hL6pLQyJqmMLZKd9r+4fnuDo4ilh8V3yA5a8krT/hVOu3lnRL1YTH072wWEplyTNQG1vLUEVu0hhCiNnw88mI+/jKWmD0Od2/GON8bw5YgmWt6iHBwl98MVoNrlGdLVjbjn95Jjf4Wlg91cfJtJpeWf99JQ1xw4fE42kIR38a2YQeJ14Fdy5Mz3QY2vuBKw==; 5:LjYABpbJGMyEaTD5OvNDYXvnVdJoXNkq51UxTHUS5AVO5sbo91NlqasLV4abWHGMy3WdM/9ZJz5BvpkEC+4PzkL65+mhyKw7ZNo6r/ju1pc/D0c98y+EzDNFN2PNax3gdRxmD3lfP/Dy2uDvq0ZybA==; 24:Z0ofbKVvjV1Tzfj8b8EEn/d+6CkIXbShvRGIt6QRM1+d8Gy68C8FPUYfJzmbZEeWLaSH9eZMmXzIc13QlMxWUR/8V8ZJorUq/wZ/iNGTrG0=; 7:R40bgqVkTodJZuZh9y20iGwVXhyrXdYDTNkNf5I23WgKtPf14UVlgUzg8Oj3hn75QPxgeEf71qVbKdEyXDrJKL1RNImmqtT3naCDxoJVTwqoAIbolkF21zduYD3y9KPHXbT0aV243DvZyypYnLsGYsqh5NQDN/i97tLGoZrpll2LCpJuOH7eYFzhGLlyCTadH+Tdeuoo98EuaQcykfCKpRI/0sPwqsUXd1brGv/eWZQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 22:05:29.3656 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR07MB2528 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 From: Joe Carnuccio Fix incorrect second argument for wait_event_timeout() Fixes: c4a9b538ab2a ("qla2xxx: Allow vref count to timeout on vport delete.") Cc: Signed-off-by: Joe Carnuccio Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_mid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c index f0605cd196fb..3089094b48fa 100644 --- a/drivers/scsi/qla2xxx/qla_mid.c +++ b/drivers/scsi/qla2xxx/qla_mid.c @@ -74,7 +74,7 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t *vha) * ensures no active vp_list traversal while the vport is removed * from the queue) */ - wait_event_timeout(vha->vref_waitq, atomic_read(&vha->vref_count), + wait_event_timeout(vha->vref_waitq, !atomic_read(&vha->vref_count), 10*HZ); spin_lock_irqsave(&ha->vport_slock, flags);