From patchwork Fri Oct 20 21:52:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Brace X-Patchwork-Id: 10021037 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 B398E60234 for ; Fri, 20 Oct 2017 21:52:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5D8928F67 for ; Fri, 20 Oct 2017 21:52:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A30C28F6D; Fri, 20 Oct 2017 21:52:43 +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 2DB6228F67 for ; Fri, 20 Oct 2017 21:52:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753537AbdJTVwm (ORCPT ); Fri, 20 Oct 2017 17:52:42 -0400 Received: from mail-co1nam03on0052.outbound.protection.outlook.com ([104.47.40.52]:22656 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753533AbdJTVwk (ORCPT ); Fri, 20 Oct 2017 17:52:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mscc365.onmicrosoft.com; s=selector1-microsemi-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=JstMuZAsxfNRTHj31LMNhQBmyPEf4YN8mLWzRZklqio=; b=l5viwQ+TXL2noNsna29H3of0yTWFebP7uiY5QFdxDwGQBF7iXI6CAYn/kRk6oPEb5NOkVJJdwmO225pAr6yUvJULTaeTQNmSF2UnDwE4pBJPZrJ1S6thIp6lXcpJpx/cBSWxIyMrsRSCZsa2zCloeiQMA8Q/sdYknLNmjSOyYXc= Received: from MWHPR02CA0001.namprd02.prod.outlook.com (2603:10b6:300:4b::11) by BN1PR0201MB0740.namprd02.prod.outlook.com (2a01:111:e400:56::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Fri, 20 Oct 2017 21:52:37 +0000 Received: from BY2FFO11FD048.protection.gbl (2a01:111:f400:7c0c::137) by MWHPR02CA0001.outlook.office365.com (2603:10b6:300:4b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Fri, 20 Oct 2017 21:52:36 +0000 Authentication-Results: spf=pass (sender IP is 208.19.100.21) smtp.mailfrom=microsemi.com; suse.com; dkim=none (message not signed) header.d=none;suse.com; dmarc=bestguesspass action=none header.from=microsemi.com; Received-SPF: Pass (protection.outlook.com: domain of microsemi.com designates 208.19.100.21 as permitted sender) receiver=protection.outlook.com; client-ip=208.19.100.21; helo=avsrvexchhts1.microsemi.net; Received: from avsrvexchhts1.microsemi.net (208.19.100.21) by BY2FFO11FD048.mail.protection.outlook.com (10.1.15.176) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.77.10 via Frontend Transport; Fri, 20 Oct 2017 21:52:36 +0000 Received: from [127.0.1.1] (10.238.32.34) by avsrvexchhts1.microsemi.net (10.100.34.105) with Microsoft SMTP Server id 14.3.361.1; Fri, 20 Oct 2017 14:52:05 -0700 Subject: [PATCH 10/12] hpsa: correct logical volume removal From: Don Brace To: , , , , , , , , , , CC: Date: Fri, 20 Oct 2017 16:52:04 -0500 Message-ID: <150853632403.28275.1721043305036068989.stgit@brunhilda> In-Reply-To: <150853443786.28275.17878578984391668998.stgit@brunhilda> References: <150853443786.28275.17878578984391668998.stgit@brunhilda> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:208.19.100.21; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916004)(39860400002)(376002)(346002)(2980300002)(438002)(189002)(199003)(16576012)(54356999)(69596002)(50466002)(356003)(478600001)(189998001)(106002)(81156014)(81166006)(83506002)(97736004)(58126008)(2201001)(2950100002)(316002)(110136005)(77096006)(23676002)(8936002)(86362001)(68736007)(50986999)(76176999)(2906002)(8676002)(5660300001)(106466001)(33716001)(4326008)(33646002)(104016004)(230700001)(305945005)(53936002)(103116003)(9686003)(47776003)(921003)(2101003)(83996005)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1PR0201MB0740; H:avsrvexchhts1.microsemi.net; FPR:; SPF:Pass; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD048; 1:T+CKOxSum9Vw0gUQUXOuvAATR7K9p0te3Gb1p6h8NRXYkLrTR7ioCPmqg89NvxPmgZM/cEVKd40/hAa0rPsb552kPwqJf/fmAl1mDIjAK+6BrU4r/osnjhAespkNSjJ2 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2af0b71f-aebd-4b54-a3fc-08d51804e086 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199); SRVR:BN1PR0201MB0740; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0740; 3:299JaRoRRd7LKZ9i+QjcpD49gLIY947vXXs3nw6Izyz6jf3Fwp9cK2vB/laqJtr1K5d2Euyw593sT4qWrjInEsOWuRNykihgxXzIRKcXJKxyJOJdI5gA2ucWwdwxA+KBWqVz2PS/3WHOKa7dSPh1Xme6xr+KhTQCDgAmWmevrsU8W0GPF65B05eEw1WdtaklvVlr4uKnF9b4q0QzZ8zWw3lhVmz58r8JnYeF5jRVbQnafOBg8y+Bi7Zm3StM0Au2LkZvo+DXPiy4UlGY3beKDzRVGAbfeiGff0Gf0dpw/Mj5BQYrWaq61GjjRkl729/zGMVKx4St/nqNaJHho5twydld8DbIQ9AbxuWHUMBOKPA=; 25:1hhlQF6kY4QbrsO+gBIpULmZ1/4mJ+d71dztk7k8ilV5zbvv4aqeJhuv+1MgkjAzgNAJmlgAgTOa0Tc1zFxgzsKwag/+IbCp/7YYn1EneNk7cQyO7IDctHccA54EVslUndTifM14fhk8v/Nnv1o82aLOqfRvFHat2AUMcSyCMHvhBNzkBcact/ECGt9rh6dLt3l4/Jbi211g4VZ5Rm2qwxt/i5e5VKj5cg0TqhJ3UqZ+avbhF1WEm9hW78iTWm5BFGDPK77SJRfw2zFSKcQa6tglyvfvuCDI8uny9p1qoL3rUS0tK+gUJIaXsti1TKIcLKaCp0Qmi770COVN4NmQ0O2TzRzyeAqAP6CHvxeKWTI= X-MS-TrafficTypeDiagnostic: BN1PR0201MB0740: X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0740; 31:9Kt31/DOGWn3dZePKlGfw87p90iSd8GM54ptQ8da80QieAtYz6vIXNEGhJHlmV1VkEENgiIvtIlL6JfRmO/bMdT2Zsd6aPnynYqAubScKoOqeCXtEGtc1/sTRrcMn2yE1jS11ni/3uke/WTwkDPvJcJ8Ps3cHfAYBJupgPcdfImnJYan8ohv9QH1HFRQzzVKEJhijALzlW1FnEp17VWYeIBXj1TzpLoTMynK5naHZsY=; 20:hVW0U5PIgQzy5LGqstf+AQQANFB6BjaVra6xBzdSbFMTJLbn2UtAX3YJO4ZyTFdGUkPdN1idfTNsjH9/pQjZdruYTiWHKsgzqEw2fNaC8PRbX2JrFysV5jTDBF/SpPrvh0dKOjorIw+Ka5sbsoBEFZMFOFRJqLIN2cJCjuTvhY0AGJZ49n3oEAoySdlTYpU1ZuFNeECc3QtN5Do36F3hcpeyh9EVIjWjzPQGAB3jK8uV6p5/dKUVLpKSy6BkHdl3DQPNEBYg0HytjG3HROx6SwPm1usN5qG4Y0sv+B539mYt01WusxesN4Nl/B8jDDwkpXGp1hxrA6FD1Nd5P3Wcl/+dSXSy7PjhIQGzTHM05/+rKpXFwiOZCwxaSci4bM2Ao9XX346yVfRH4jVYxpEcydhu/1hm8r2JNcE0XyT9oWduMymQURfThcwl75wRLuiVZC9N7y3KI9PfZT21kTTbSutj3HpzMP1gZXfQaH6Zr0bsPR3ktt76Vbjj7fXUzxOi X-Exchange-Antispam-Report-Test: UriScan:(72170198267865); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(3231020)(93006095)(93004095)(10201501046)(6055026)(6041248)(20161123558100)(20161123562025)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN1PR0201MB0740; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN1PR0201MB0740; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0740; 4:V6B7YII3cqGFkFLygGpe1pR1VN0c0TbIH3dw2sWqoch2cs+AQpKJAq3kWVRoeBxgDVxXfFn8qg/PlL1Or18sMnttT6OKzfUEan036AOWNXVnmWmzK+CO4AkZf0mGWg3ulK2B9QPxYHxWUDGlpglBQzDhr0IIaDTGgoTfrfhDGsM5uQqGsvzYdB9qXoxzD2uXYDTVofG2skZHGJ1Kxvv7poq4lYvGcMBk3HdGBexcJ/YSK+LxooxokT4e2XZ7zTr6reHAQierhNOoKgaYYVBN4IryzEqv8xW06TKtU5sadh4= X-Forefront-PRVS: 0466CA5A45 X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjFQUjAyMDFNQjA3NDA7MjM6RFZ2ZTBlRExqdWVvbTlpWk94djh1QitG?= =?utf-8?B?ODU2TFpUb0hocElqZk1uRHVwQ3BraGFEMlJwVHZES08xYSsxa1hJWlhyRDBY?= =?utf-8?B?WXlwWXFna1RwOGJ1bU5JSDM3SG5UaFliREN6b1ZFZ0piZ3NxdFREWlY3MWQv?= =?utf-8?B?a0RZZzhaRlV4SmxyQWJVQ043US9YQTZlWlZqMFlsZWxDR1FJVmpqZG1zQWZq?= =?utf-8?B?aGx1bnE1WXN3d0lkQzFaMGpyaVROMCsrTk5TbmR6VEtoMlg3MG0vcjE2dFB4?= =?utf-8?B?ZzNkV00zaktISjJFa2NUcHl5R2JlZVVqL1k1d0RZZ2pXemtqSkFkSUYwdmZW?= =?utf-8?B?YUxtMWtzd09NaURINzBGOHNZTjhZd091ckVXbHBrNzZLMFBscWVINzRoSFo5?= =?utf-8?B?aE5RU0VqeTE1emxMTTY5SDRZUFh4TXd3VWNPQzJQM0tKcytVWVVJUWpwOHdv?= =?utf-8?B?bTh2Y3FReDJnM2xnaXFkeGtublh5Y04xTE9ZdFJIVi8vSVJ4VlZYNEVPdnE5?= =?utf-8?B?SlRXQTBOMTcwZXZraGh3T0k4OXZJSE9va3B3c2M0QUQwUmtZWlYydU5JOFNQ?= =?utf-8?B?Q3JpcGkrK1J0dG9UelJtTzBybmVMTFFhaEs3dGpIYkh4cHhQTmtQS0pPZGE4?= =?utf-8?B?VGpndHQrTWlKR0hGUWt1RzF1TWhXMkMrL1JlTldvTGFqSGZNR2xxamVGTWdO?= =?utf-8?B?bnN1ekhwSHBTVTBUS1dKZXk0ejdWREthcnB1N2xSTFl2aUIxWEZJVk5ITzRL?= =?utf-8?B?TUZqSHFLU2Z0Nkp3bThtRkVXQU5FemVxbGE0TjUvRWo1U2FNdVFWdUMxWXFm?= =?utf-8?B?VGJpK3RrTUhUQlFFTHVvK0RXemVoa3d6dGdaeHJQQ2FOajBOeFlFaTU2RE5n?= =?utf-8?B?U1ZhTGp3c05hQndwQ05BeHlmc2prS2xTaHQ0NzVNcEtnNHd4c1B2ZTFkWEVr?= =?utf-8?B?VlVjVW5NM1Nxb3JGa0NBd2JMcDRIVGhGL2VrVnZaY0dsZjJRWTlKaTliaUxD?= =?utf-8?B?Z29kWEtnSjZnNWxIaWt0Z05zNDBDU3BreUlPa25MdnI2My9rNGQ0Rmg3L0Vu?= =?utf-8?B?clVSV1FreHZHZmNRcTl6cUpybk1qaklIWkovMDNaSkxLUnZ0aDFnVkc4UFBP?= =?utf-8?B?azFKT2hSMWZmVzFIMnRvVTNJdE40NlJlVEZ4SnUzbi9GNEhpbUw2OE5BZ3Jx?= =?utf-8?B?RElzemhRY2JmVFU3ek1FSjltQ1lQM3k0ckVLMngva01WMEhLNzhEZjU3T05O?= =?utf-8?B?YzdGSGhid1h5dnhIZXdmYW9kSWtaMzJ1aFdxMzQ5TTBFQldaY05nOUR5U3dp?= =?utf-8?B?N3BYUEtzVDl0YUMvY1pkRmRlUGNlVm9pNS9hUmJVTm4rdFVneGFqbHdrbDZN?= =?utf-8?B?ZHQzcE5mWTlxNTBkdWRSZVptMjg0NnEvam01bVpBTk0rNlpyOTYyOVE2MXl6?= =?utf-8?B?bkxCZ1BqbS91UWVIWnhsMWs2a2dHUGRad1NZK3hWV2Z2L2Z6RGJ1Y2ZsdXB5?= =?utf-8?B?bFlCY25TSFhqbEZDU3YyTHVlRVJ0MEswMC9GQzdWUzI1VWs4NUEySVV5QW5m?= =?utf-8?B?SlRhR2xSK2hhcDdEZDd0SGRRdVVlck9VcnV1NHFQbDhXUnA4VytaMWtUelln?= =?utf-8?Q?w=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0201MB0740; 6:wIpzkr99jT0asy9Yy1Nc8LiVS/nAoz6XJRNUK4X7bk4VonS27rKoxkSKYFXHImFYaffGwYSxQ4wK3aNCewTx6hOqxCpMS4YFt43QIoT+Yyq82jt42eGKIc3/6nwIfDMSYY88OJjMf3BMqHtXPIAJ/d1a+L3Bof3sr6s8kN1ukTVpHAjwqbHVtdqSLRy9bGxjJHuWHaNP87FL3i597TXbHg1XBQ9WWb05unQOnVi2F2+vEYu4Alv3SrmBUj3s8llElPTVqpaJrfvSwe97LaUMrbtt6HX+4CV88d9V6c/3yE+mdkt0OpWpDo4TGYIbU59NWyHj8+l9FrKHJ7BSL+oRXA==; 5:iTb6avVm5PIRuXpAZrLhOH5ylplGuagdHRsH3FyVQYs4V2ln0sYcylz0yEbHHgu5eDxqqBIFQ0n66yY2qm3rWgujtGG66Qz352y/++czcYEiN8AYS0I20ayWKPM/GzE8LYFb7vlkF65tiwaZzcvelw==; 24:kKqSkg8RW6d6wlZ8MOWQQ0ApH4qci8K6rpYAUfuvi+mG8fUjgDbE3MwyRRTCGD+jWpd0HGg22lPwBsNPwPh3VLHo7OEvGCPZ/Z5M8FcRuH4=; 7:YJYL33uthxkV20YCYYs5dk9yerZUJ0eaI0omvonHMDB7lbGIiAFRKJkEI3Q97f74Yhm258EZdoqN6abHA6A+NPGl6hpfsv+3Age4CBpHZx2P/tWrmyHn53jxnw8dG5qbaH8A7tITxM5gFsp/xS29PgsJ7jMFzBzznaQQszdCbsL370k5p/aMgmKn/xKJagw0AULK/dWooF8A+UG04ST6kmq8IrulE9zb7ztRyPAd9M4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: microsemi.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2017 21:52:36.6309 (UTC) X-MS-Exchange-CrossTenant-Id: f267a5c8-86d8-4cc9-af71-1fd2c67c8fad X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f267a5c8-86d8-4cc9-af71-1fd2c67c8fad; Ip=[208.19.100.21]; Helo=[avsrvexchhts1.microsemi.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0201MB0740 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 Suggested-by: Martin Wilck Reviewed-by: Scott Benesh Reviewed-by: Scott Teel Reviewed-by: Kevin Barnett Signed-off-by: Don Brace --- drivers/scsi/hpsa.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 228d744..a536ed6 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -1882,6 +1882,12 @@ static void hpsa_remove_device(struct ctlr_info *h, if (!h->scsi_host) return; + /* + * Allow for commands to drain + */ + device->removed = 1; + hpsa_wait_for_outstanding_commands_for_dev(h, device); + if (is_logical_device(device)) { /* RAID */ sdev = scsi_device_lookup(h->scsi_host, device->bus, device->target, device->lun); @@ -1899,9 +1905,6 @@ static void hpsa_remove_device(struct ctlr_info *h, } } else { /* HBA */ - device->removed = 1; - hpsa_wait_for_outstanding_commands_for_dev(h, device); - hpsa_remove_sas_device(device); } }