From patchwork Thu Jun 1 23:27:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 9761341 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 A68F9602BC for ; Thu, 1 Jun 2017 23:27:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9808D28524 for ; Thu, 1 Jun 2017 23:27:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8CC7F28544; Thu, 1 Jun 2017 23:27:24 +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 C3E0D28524 for ; Thu, 1 Jun 2017 23:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751152AbdFAX1X (ORCPT ); Thu, 1 Jun 2017 19:27:23 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:64778 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbdFAX1U (ORCPT ); Thu, 1 Jun 2017 19:27:20 -0400 X-IronPort-AV: E=Sophos;i="5.39,281,1493654400"; d="scan'208";a="23392904" Received: from mail-bn3nam01lp0175.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([216.32.180.175]) by ob1.hgst.iphmx.com with ESMTP; 02 Jun 2017 07:27:19 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=B61bbBP+XG7V7edvZOEhxOo9VxnWBr5jWdNwaPIz0f4=; b=pYbdbXwkhIh2sg1+qt+sllxlD+kioSdAJJkF0Ysge6EueAAzzuEMLE/53TugNp1V57nXgxcVuS4vIzH4LT+JQlKogJoWUIiTtAaCZHXaERMUzLCOWmMA9xS/v7NT1bRbmmA/2TNI5CYDi7mskVEvg0lRyl5zbVBR1WuDuxk/9F8= Received: from CO2PR04CA0107.namprd04.prod.outlook.com (10.165.94.161) by CY4PR04MB0391.namprd04.prod.outlook.com (10.173.188.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Thu, 1 Jun 2017 23:27:18 +0000 Received: from SN1NAM04FT041.eop-NAM04.prod.protection.outlook.com (2a01:111:f400:7e4c::200) by CO2PR04CA0107.outlook.office365.com (2603:10b6:104:6::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9 via Frontend Transport; Thu, 1 Jun 2017 23:27:17 +0000 Authentication-Results: spf=pass (sender IP is 63.163.107.21) smtp.mailfrom=sandisk.com; mellanox.com; dkim=none (message not signed) header.d=none;mellanox.com; dmarc=bestguesspass action=none header.from=sandisk.com; Received-SPF: Pass (protection.outlook.com: domain of sandisk.com designates 63.163.107.21 as permitted sender) receiver=protection.outlook.com; client-ip=63.163.107.21; helo=milsmgep15.sandisk.com; Received: from milsmgep15.sandisk.com (63.163.107.21) by SN1NAM04FT041.mail.protection.outlook.com (10.152.89.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.1101.12 via Frontend Transport; Thu, 1 Jun 2017 23:27:16 +0000 Received: from MILHUBIP04.sdcorp.global.sandisk.com (Unknown_Domain [10.201.67.162]) (using TLS with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by (Symantec Messaging Gateway) with SMTP id F2.A8.51736.3D2A0395; Thu, 1 Jun 2017 16:27:15 -0700 (PDT) Received: from milsmgip11.sandisk.com (10.177.9.6) by MILHUBIP04.sdcorp.global.sandisk.com (10.177.9.97) with Microsoft SMTP Server id 14.3.319.2; Thu, 1 Jun 2017 16:27:14 -0700 X-AuditID: 0ac94369-6dc8f9800000ca18-97-5930a2d30935 Received: from exp-402881.sdcorp.global.sandisk.com ( [10.177.9.6]) by (Symantec Messaging Gateway) with SMTP id 1F.83.11415.3D2A0395; Thu, 1 Jun 2017 16:27:15 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" , James Bottomley CC: , Christoph Hellwig , "Bart Van Assche" , Israel Rukshin , Max Gurtovoy , Benjamin Block Subject: [PATCH v2 06/12] Make __scsi_remove_device go straight from BLOCKED to DEL Date: Thu, 1 Jun 2017 16:27:05 -0700 Message-ID: <20170601232711.29062-7-bart.vanassche@sandisk.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170601232711.29062-1-bart.vanassche@sandisk.com> References: <20170601232711.29062-1-bart.vanassche@sandisk.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRmVeSWpSXmKPExsXCddJ5ke7lRQaRBtN+G1p8uXmF2WLl6qNM FjcWr2Wx2NjPYdF9fQebxfLj/5gsTj86wO7A7jFt0ik2jweHNrN47L7ZwObxbPphJo+PT2+x eHzeJBfAFsVlk5Kak1mWWqRvl8CVcfJsG2vBG/GKdTMmsTYwvhPuYuTkkBAwkTj5roOpi5GL Q0hgKZPE42cvmCGcrYwS06ceZuxi5ACrWnOaCyK+kVHi4YzJrCDdbAJGEt/ez2QBsUUECiUu betgBCliFnjOKLFu7kxmkISwQLDEyzs32EFsFgEViVl961lBhvIK2EscX5IIcYW8xNktO8HK OQUcJPa1nGECsYWASpoOz2YDmSkhsI5VYtedLWDLeAUEJU7OfAJmMwtISBx88YIZokFd4uSS +UwTGIVmISmbhaRsASPTKkax3Myc4tz01AJDU73ixLyUzOJsveT83E2MkFjI3MF494n3IUYB DkYlHt4HsgaRQqyJZcWVuYcYJTiYlUR4180HCvGmJFZWpRblxxeV5qQWH2KU5mBREuc9JzM1 QkggPbEkNTs1tSC1CCbLxMEp1cC4M51/66NLJtvLr9xgnl39LLEpt6dcf6Zk5z+ztW7i/7qD JmtPf3Ajdtq3gA5DpkOfXU75fBA6d39pzwvZds4fGUvU8w8cDVZ3jF3wcrWioP6MHeJuaxM5 wrTttmqsDa7n3Oj3PU58ZbJ2gcWyvCw/406tlUXnci/JR+5i7vn+Pmrz088l7b+UWIozEg21 mIuKEwGTY8H0gQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDJMWRmVeSWpSXmKPExsXCtZGTTffyIoNIg42/WS0O/mxjtPhy8wqz xcrVR5ksbixey2KxsZ/Dovv6DjaL5cf/MVmcfnSA3YHDY9qkU2weDw5tZvHYfbOBzePZ9MNM Hh+f3mLxmLbmPJPH501yAexRXDYpqTmZZalF+nYJXBknz7axFrwRr1g3YxJrA+M74S5GDg4J AROJNae5uhg5OYQE1jNKXJkrDGKzCRhJfHs/kwXEFhEolLh/+jRbFyMXB7PAa0aJ2+e6GUES wgLBEi/v3GAHmcMioCqxfW8eSJhXwF7i16mz7CC2hIC8xNktO5lBbE4BB4l9LWeYIHbZSzQd ns02gZF7ASPDKkax3Myc4tz0zAJDQ73ixLyUzOJsveT83E2MkPCJ3MH4dKL5IUYmDk6pBkY+ yzybSbI2V7aavNR9W7lx1jwHs+mu35TaChSdDpwyt4y8V1QT1/N4XseVnQs0lvZ4h933EzY9 udv5OGtafupypSqt5n//az+LhFsu32v8f76xOEu63NXzq5lm/u2o3h1t0C02/8KttT9bWPvX 7Dzd3jvRiPHHj1th/qxK9Zk2HgvXbyw7s1CJpTgj0VCLuag4EQBgsryPzwEAAA== MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:63.163.107.21; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(39840400002)(39860400002)(39450400003)(39850400002)(39400400002)(39410400002)(2980300002)(438002)(189002)(199003)(9170700003)(33646002)(4326008)(356003)(478600001)(77096006)(72206003)(1076002)(106466001)(5660300001)(305945005)(86362001)(15650500001)(50986999)(5003940100001)(76176999)(81166006)(8676002)(50466002)(189998001)(48376002)(36756003)(2906002)(50226002)(38730400002)(8936002)(2950100002)(6666003)(54906002)(53936002)(47776003); DIR:OUT; SFP:1102; SCL:1; SRVR:CY4PR04MB0391; H:milsmgep15.sandisk.com; FPR:; SPF:Pass; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM04FT041; 1:fMDa2wImfDAMDToryRXbmn03ymBKu4aLCrvPUt5Uwj/YOIPkWJhcm2/9UassfOBhUxBJex+jXAVaD+mxVorgPYdnPla3ZOISl8A/1cLQKFY3od9RoTgYqRFOHU5FWUDUvw/wb5Toy+goij3y/CEBP/YhBXhyKRfy1ikes10NJRCN0JS/Q08qZv1WKDKWshgsDj4syL0UZgujftPVm4HlPPrV9HX3snbDcEdvXfKT/0V8lGTz8XAF+Q3ntoqET8Ei0esnl5oNMjTX30lJQYFQCW7Gybd7RUUIk8L4Q076w5KXM8vgAv3qIKbrFcu+asTK23dfiMFf2KMn1lh9sozHJaSS+mXNdj5n0cLQHsUexPV5P9rrOstPUfgakpGUdjDAKtbnVcetML79oqx9J51UicegvDr1pInOThtLqYMbLCCQOdNZfjTP7I2YtTcO80uEko14YcDyi46s+kege+VRWo1TlpRd4MkmlBp51sUkqrPKAX4WYSg2vZSfrXG1YacOz5FX6b7zStANbr+AofrhrsyAur2Dm2j15nBcFck+UIgIXeIYlTKk1eJushg+rSyfivTYHOxqxFximaheEYegVw== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PR04MB0391: X-MS-Office365-Filtering-Correlation-Id: c8ab240e-d52e-4adc-eb45-08d4a945bdfa X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:CY4PR04MB0391; X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0391; 3:Xgrm74FZVn+Ti27ry45fPKgYLo6uK7g+Ele0hWciP+7uyHKhq00PZcHj2kfLuhDeor5kGXsP60PuFcuQjfGsTeN5pUrd4Y4Y85XauHDodKtKmm4MDSjbNBe2QXfyk3Z2JyILb+mDEm7AnhMnN8QdIfCSq1Nk+Sq7qLGGP82jiIjX2Yqf82AOjNU8vwiImctqiL/hpQdS5RJmLTV+NCAV3lvYWIrck/6kQvFDZS7kstaiAu0Ztxhi15Z3bIx33+xwT3ThuaJLo66KkP6KfR4O7peaklIT7dy3DOXt90t2lH1ZB4lt3jOI0XrsvTHGFjKualBCV2v3lwfHr55CDwsbkkwQjxV8Wg3LRDOCi+V+qx0IKd/0YRqLab06HJEwqS/ZU+ZuUNwiF2wSKGznL02Vyh8oCqxDJCSytlKeyZWM4CTOOVsRrFHJQklZXqNsQm1Br5bDYwMXP1rX2BGv+cRoAOdwQNWmD0C7Rdqls7ROfvPeFni2QwzYLyp33u1nLZpN05k80CHZubFWrKvTKXB9yQ== X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0391; 25:gY+C/mAMGfelym5TofuXp909JeJpke3XkrC0K/d7HQGlweTqOnvThxohn7MYc0PwDazINEshHVmN/Jwnlqux6ODhT7pkLKGtyi6cPoDPRY/0pBV3hqjvD7cvhSVUMEOfL2Q6fK9g/ggnK778k1O1eVyP5BkvCJoaKOgYhXf4nw8KNRq2ToKb7pbY89WLsLt5+lfKO2QVbEcyRfrIjagdb/PNVUeojKBM9vc3XdDCpKnVHiS/1fJaPLfY+SblWRUzRvBo74R6UfPemu4z04XrQLwh1mmUTD2prJlkBXG5KuRbGFWq5WvfPOCicomqFRowc4oXIcw22xERrh4tVn1T+XrYm7UuKVNGrGQmJb9s6+bwqw1KqXk/eu7dn/EYBY54uUVZptOZFuzL+RVSIo+hBzInpCUg22wdZmUl2qyzdZg7+t3OL7i+J49uj23pHW6GB5keF+ZQ0BpR1beOtc4xnmtpGvBcQsGAxd2t8aAwsk4=; 31:gefiPkeV6+ca5TnbaLZ3fu03iZlccT+FOOB0kTbTNmyf6QQDRmZisxj0umRAuLnwuPkYRhiy/cwNLAtrWrwBOsLsGwCtre4QWjRRPRAmdLxs1ebJaSGR7yBkTY+/P2g0tKqrzfeHgB5pSGbOZOOk5AkvOKWeXGaQFdYOGTKlkvWbFwGBRpkptZAMaHhNJIYdle/x5eQMCLbasbAW3OsIO/GSWQWbd2a96lb75uNfhu2rD5q8qTJOrOQXVCvlqWj5K2IIRo5c+th+MoaccNmICw== WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0391; 20:T4fnhyigAn8cwT1ELMbqN4V5Azi/Gg1824+PSBanFg0qgd0hDR0OtHVyeNC3otA24i/K9k5oqPXj4ftL9dy0t3wjFJhb5yRJsTH/3b+JZ5Ke3P1Tj81cys0kAWUOGmeir08cfDX2qG1lGrLsVou8Q+yKVXnEf1iDdJRS7lZDCsWj9iS7QR1Xng5TXukPg5r5U73Tii8xlzD+z7gZQWu4BK+XiT6JnCT4IVykBPu+GFQP6I1AuS9z4oV/dbNoFlRzAPXimOXbDM99jlZeODrO3nFZ0cgfIoyfYvCL7lOw8WqiNjjkx7lrRwi4Xmivp+WoywjzxKBD6TL7Gh7iu3z2E48IpENDqtGALVA0EJ0cL9SBo9RsjdFMwCFZaNI78fC6JgxAtg3bbzYudT2npUauPkWVUrLTHLKKbbI1yarZlpmRqFa/VJFsFv9Ye4E3hsvnBlwvgEviU179JPtSNd/xeaoFpVLAwoh74+Tinb8yq6t3g6kuhdS9UEODeyNkzFKQ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(104084551191319)(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(93006095)(93004095)(3002001)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123562025)(20161123560025)(20161123564025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR04MB0391; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR04MB0391; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0391; 4:iTA9endjR7Dz411+z2R5UM0GXNzYGIzoea+c4h5a5J?= =?us-ascii?Q?3EWE8U3FRhxbjj61Baj6o65oHjKm/b5BFdVSS3ykZZ7II2p+qXQPi4mZWA1d?= =?us-ascii?Q?lBJd9PpIWN1Q32Wf3cyB4e0+4UiJWfbyYJMCa0mEGPgqF2RYu4BKFDgdalJ/?= =?us-ascii?Q?9J1029ygz99OGgblBpPi2Xd0xi5JWvJcti1K9eAP/iyOYFpdGgmNXXnfGScq?= =?us-ascii?Q?v0tpsEWKUWGXeCIto/VppzMkjPRb8kIqJxcXx6k5e+AL/3AYacGvUDftg/TX?= =?us-ascii?Q?Xu/+RvqpEACz7bBt+/XPXSBy+ty/7hJS+gCHVJlYGvnutEhzp+JqobpskIQr?= =?us-ascii?Q?uWPvuu+YvZBM5kaHKp0T4THTGLoza+CO36LRvulUEXrty6blR2YrHDr9DUCM?= =?us-ascii?Q?eLDN0wmOsUnldsI2Opk3WM0jZKMC8PG65dF7zbabmgxxPqb1W8oAwgq70vto?= =?us-ascii?Q?7aj5w8kbzkXTMrFtTckezdvkWNkM3aV2PSpwUMYzJvk++BUaIOYK0OyH4q6+?= =?us-ascii?Q?qZ6MEHoSDdOVz5MW1eVZrf3PMVzHZv7L8ryUkYp7M2dVq6eTXbv1N61R5jpL?= =?us-ascii?Q?jIAol3Ixny7bffsxlzEkJWBOI2Kj/rhezVqXu4hWdod+Qt2eRzTDcM8+ZwyW?= =?us-ascii?Q?0jORwULuIn3kIZ+KOiVV16MEJsFn91Uy1+Iqev/4FJZ1FJh4ZM9NZo78TK2C?= =?us-ascii?Q?9oCAKCuL90AI9h3xRtknfN8WUvhel909b9vrVAeD7LE6fklW9e2Lb5//jYkz?= =?us-ascii?Q?+gbXU9lZtwLXLFceoTlZyIZ9X2qGsPaNc8IocxqiPCQQfdya9o7r1wKkEBt8?= =?us-ascii?Q?meAhj7aDGDZS/YiOIuOQcBlnpgwga5VCnHGoJGDVM7QrzQRq/H0u/kQhLHFk?= =?us-ascii?Q?wQ2krs39Fb/yBLdCnVOb1qJcW4Jyo3mROtf878dubT0w57wHrsVUwmDp+vYU?= =?us-ascii?Q?rDKzpIkiCn7wsma6y+3UFPkENg1VBh6H2wJqvnV73CX6LFN8DTTc3CUkS8Lj?= =?us-ascii?Q?QLqvIp4cQy1r2IOx2wMPukDsIutc+YQuRpsSW29ZMhgna5ywfqP34/SSspnl?= =?us-ascii?Q?ApXg1st143M3DMuJf2VxqO5b2RE44pcBem8oQ2gYY+p3nVBG8DdOIm/4pIAI?= =?us-ascii?Q?S4Js5VSi/0Q3pCwX0j0hMiCpXKlAD+mAlMSQMPWWx8F5tTgFd5+oI5AeOpas?= =?us-ascii?Q?xsw8dC4rWusjsl/YkozO6BfU/ujLMHB6q3hwUL9aKG7T/r6+CeArv1WNClhj?= =?us-ascii?Q?/wn0S2+AN4ngBxQYY2eaYiVPQ1fbVe2hox6IzuU+Q2Ot+aC0cdrWi4+EjgUw?= =?us-ascii?Q?=3D=3D?= X-Forefront-PRVS: 0325F6C77B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR04MB0391; 23:xTAYWXUO9ysVA7sJUkQKcuZDZQF1UsSiwuVo2jWEa?= =?us-ascii?Q?mYxVVhZRXCAIue8T/yFQhRkyGH1zo93BhDgRm0XX7+SfaqAdLAP/dlzW3EJ3?= =?us-ascii?Q?ZLIYoCm29nca6jrZhRVtdi+eY94uLuPTpz0LCEgxwz2d+zT82SshcSwukLpg?= =?us-ascii?Q?sUK1GILfQh9IK/NCpwNmKNpRazAmwmk5G1zKXyJUKVgs2t9Pz8tLCdqWp6Yb?= =?us-ascii?Q?7V2ucOSYYFneeYtSJNfam7Kvmf3C51lsL0A50JamI8WWP7K6iXvNqFUN0zf7?= =?us-ascii?Q?RxbQyXb6cWcQojuO6k4RIe/tDF8pHctzRjSZJLjhlJQYxU+t0QitFHMSMIeH?= =?us-ascii?Q?u9wucv/V6tq0xWKbi2wLSBcNGn3I1fioz5YSduLVoPcASSbCJyXtLvTwJFYN?= =?us-ascii?Q?X3tz807F6xbeFt8T60jrnelZnh/TDJXnMW6VicXfZk02qDBdSbtFBY7Ee3r+?= =?us-ascii?Q?ftcsgn2f4lli4vK5TrWsmKwHpjLGQlHiAFEjHx6O4c5m2Udg1KzUHsSYSgst?= =?us-ascii?Q?YEYTf58nYra2/tttiAKGiWbOub6W2vfaGL+b/wEbb4nVlcdRfICwVYgFR2vf?= =?us-ascii?Q?2tulZXnk2M9cVlKOBWyADgnG2R+IG2xM1xsPrNclARA3iTv6PASXndV5r5Rf?= =?us-ascii?Q?OS1WpmqrG86ZPrE2aRYjK8JhQ/gMoHdph6bOwH/eu+biskv/waDG/0wdqLbW?= =?us-ascii?Q?v0dLCP71V8u15rIugpBxPb1wKGodav0nIuMRg/ESDwa4s8aHJFmvy/zzYLbo?= =?us-ascii?Q?50r3JcD1woGRtH1ETDKff0B3EAecQkL2sTwlGBTHlKqIeIQtMAvYok8dAz8I?= =?us-ascii?Q?ksx09PJQ4XLa0rD5t+Ey+NOzTl6sql9IeofMxRdFVmiNruFuwNa1kvvEnbur?= =?us-ascii?Q?pJS8H2trDRPjKWm8QGMegtBPBNTjz96uxOqLP0I5WzQXeMC3xrSJTAfiCSuU?= =?us-ascii?Q?lENmBmd9aAKzzlxTvjghya4NGl5sUDWik0VO3eFHbZG+1UNqgVrAHQRyPK7y?= =?us-ascii?Q?O6fSBXg+UDohW9kja8Q0Mu9XDcYCD5aSDs0g5jDwCCJRJy4fINcaqmgL6GrB?= =?us-ascii?Q?FA6KaBgbE2ZU8dngBt/ktw7Wyit?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0391; 6:ie/MSen+dOjlSUBfvXh7p+1Xq8Kxm98nUxMgULwsbX6/QR/urB/TxDUIjHyMY1gekuwN5KmEyjYS8iJ6LaK9NkqEAtD/SQT3n7EiaX3PBIZ+m+CFkuH30e9yjoWqGV1YctgmrUGLJOfOnLEWbxNWmWSwytcZ3c/KwlEjH4OO8MC6p9SNKUtZoaR8xCyjUnuicGoHwFP5ds5WGgTupj0v7gz4VeKC1hqmul7wZA3dECd6AUvP2llwODjG/CHuIFplodA8tU2I12czgAvTjHYteOC0GajdSxVDVuCb+1fOE2VfWVq1B3Nzv4lIipjnzbJ6y3qwIRgOikVSk9O92H8IpIXDH6OheK6h4+sZZvgGMtZ5nAiBKelwcWRIOglKzbZ2GbDQ6T3Olc5ggxvTv8y7VPtQH67raeCZW/X2Is/u/QTxDtj2YU/XJezimiRcp57PBZ8G7dy3Ey1fyOaDDrTHClpQ1B7N90nDMZiy+3sR06TO0yQc7sV3D7ZtFTzsn0eSwGgSh7z6eR2aT1I0XwQNzX/EsJuEQen58ke65IIOu5k= X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0391; 5:y1von6KkbFEVXxG9IoP7UOo51StRbvKFntmJnb4Zep8I/gT4SGkGawLz7gSllGjGm0hp9eP0jhEl9qMiADRvhgTG85SYvkg7fX7hvWvKCZ0rXmYJK9jAEFNJKm+EspLAc0WjL/6TodgvCT2T1YKv7rQL9awd11tPR9vLpULzeS9QkTSlpVNi8lWIRh849qaWV9nt6slWNn5XNR/tCKaWzKwF5XT4Bu9VpLMU6fnkKJf2pJUMmXC/su+Qmk2zlJ58POcwxJINKt4cTDILd8nctP6i1CZDN4OB9/Go2BWrb51HqCrlU/IEdM1gbrNVPSIzb6f/O8UEsq1sO+v4+fp7yMtdprdCpAaFYVryLLj40C6oSV3FtCgJ0FiXOUy5qWCWGHTKqB3C5vkvCrjpMS1u2bAH9x61lNtsVaodPkFNWjEXAhnf3YFsRmLXcmvgx+yzwkqgr2YtPwvCbbu/C1JaIkU5HIsLZF3/jfFOqzOisNtCC5ATQAL4aO8Si2Q86/l5; 24:iBv81/3Hf2XfZ9XlPOXMdVw6SicdXm2WogJ8NOfDjg9xbZe1/6I8tXcKaSrojhUd9bZ0Lx2YikcPA7nlEmlnMBYxny7S3OoQw8yNYB5KtVU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR04MB0391; 7:zCj9tlunf7U2+4F5RTVKX4pKyadEoqJIo6xwoJl6Is2Ep7DS+WLkbEDAh6zHZZF3geI01onIDgZD4YeVHU1kKyNn6HAXaAIdVoXYwK16H8PPoBiqGNeMsZNbV/Q+9tdpDtp6XPliZemqAg3g7FiVCf8/VG6OU9dI203r8xuLEP0uAJOcVxTq6yINp1NXLRGuJKM9xc85s3rp5hvkvEnRevRP11rDunXLv8CpJT5EVQcYMBhZRGbWMp2JZKE0zCkRypIHYrhqF/oeDNzUy+4TMs8WxZS0s7VBKGqj3y0WQVZ4+ukRy3bErKT0sGTKdxW1kgN+JYlyPJQsRY/oIPR5bw==; 20:5QuddGDr0ROM0U5HA55n6fX2oTuRAzK6ZMbV85mFugMM59KyeCSapkkiJaax+UZJHZU4bAHx1oIO8L7+JaLgBaRWExqz/xL4ly5OT9Sle8zX4BgDH/Bx/E/RJdxrXBWbohFAXYd6uHgsr0qxTeOkHfC81T1078bZBSobUxZDAT4= X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2017 23:27:16.5008 (UTC) X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=b61c8803-16f3-4c35-9b17-6f65f441df86; Ip=[63.163.107.21]; Helo=[milsmgep15.sandisk.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR04MB0391 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 If a device is blocked, make __scsi_remove_device() cause it to transition to the DEL state. This means that all the commands issued in .shutdown() will error in the mid-layer, thus making the removal proceed without being stopped. This patch is a slightly modified version of a patch from James Bottomley. This patch avoids that the following lockup occurs: Call Trace: schedule+0x35/0x80 schedule_timeout+0x237/0x2d0 io_schedule_timeout+0xa6/0x110 wait_for_completion_io+0xa3/0x110 blk_execute_rq+0xdf/0x120 scsi_execute+0xce/0x150 [scsi_mod] scsi_execute_req_flags+0x8f/0xf0 [scsi_mod] sd_sync_cache+0xa9/0x190 [sd_mod] sd_shutdown+0x6a/0x100 [sd_mod] sd_remove+0x64/0xc0 [sd_mod] __device_release_driver+0x8d/0x120 device_release_driver+0x1e/0x30 bus_remove_device+0xf9/0x170 device_del+0x127/0x240 __scsi_remove_device+0xc1/0xd0 [scsi_mod] scsi_forget_host+0x57/0x60 [scsi_mod] scsi_remove_host+0x72/0x110 [scsi_mod] srp_remove_work+0x8b/0x200 [ib_srp] Reported-by: Israel Rukshin Signed-off-by: Bart Van Assche Reviewed-by: Hannes Reinecke Cc: James Bottomley Cc: Israel Rukshin Cc: Max Gurtovoy Cc: Benjamin Block --- drivers/scsi/scsi_lib.c | 2 +- drivers/scsi/scsi_sysfs.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 6a58a124714f..8665eccd2fc8 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -2624,7 +2624,6 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) case SDEV_QUIESCE: case SDEV_OFFLINE: case SDEV_TRANSPORT_OFFLINE: - case SDEV_BLOCK: break; default: goto illegal; @@ -2638,6 +2637,7 @@ scsi_device_set_state(struct scsi_device *sdev, enum scsi_device_state state) case SDEV_OFFLINE: case SDEV_TRANSPORT_OFFLINE: case SDEV_CANCEL: + case SDEV_BLOCK: case SDEV_CREATED_BLOCK: break; default: diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index a91537a3abbf..1f243ac16010 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1290,7 +1290,20 @@ void __scsi_remove_device(struct scsi_device *sdev) * wait until it has finished before changing the device state. */ mutex_lock(&sdev->state_mutex); + /* + * If blocked, we go straight to DEL and restart the queue so + * any commands issued during driver shutdown (like sync + * cache) are errored immediately. + */ res = scsi_device_set_state(sdev, SDEV_CANCEL); + if (res != 0) { + res = scsi_device_set_state(sdev, SDEV_DEL); + if (res == 0) { + scsi_start_queue(sdev); + sdev_printk(KERN_DEBUG, sdev, + "Changed state from BLOCKED to DEL\n"); + } + } mutex_unlock(&sdev->state_mutex); if (res != 0)