From patchwork Mon Apr 24 07:51:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 9695781 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 8D974601E9 for ; Mon, 24 Apr 2017 07:51:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A4502654B for ; Mon, 24 Apr 2017 07:51:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F26826CFF; Mon, 24 Apr 2017 07:51:46 +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 53BB52654B for ; Mon, 24 Apr 2017 07:51:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1166262AbdDXHvo (ORCPT ); Mon, 24 Apr 2017 03:51:44 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:8132 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1166215AbdDXHvn (ORCPT ); Mon, 24 Apr 2017 03:51:43 -0400 X-IronPort-AV: E=Sophos;i="5.37,243,1488816000"; d="scan'208";a="13405433" Received: from mail-dm3nam03lp0022.outbound.protection.outlook.com (HELO NAM03-DM3-obe.outbound.protection.outlook.com) ([207.46.163.22]) by ob1.hgst.iphmx.com with ESMTP; 24 Apr 2017 15:51:43 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=8pW68naxkKXz6qMdKlBCwMGuzhVflIAAGpaMLFfYx7o=; b=BYawtXzy8Lw1XV4pMK2Ncx5e8v4OkoQvNfal86OyW43oUB0jYcDvqLErQdikSoEOhXkN7p80EosvYpHEpPvwnkIH7YKAbTc6lTt8kw45QMJhKvZv2LQDPGcbYBr4heyPYn5aTa+8gPPoF0YCBmb2WKtCGQ28Ul3FLQHyrMiWwmw= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=wdc.com; Received: from washi.fujisawa.hgst.com (199.255.44.173) by CY1PR04MB1980.namprd04.prod.outlook.com (10.166.191.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Mon, 24 Apr 2017 07:51:37 +0000 From: damien.lemoal@wdc.com To: linux-scsi@vger.kernel.org, "Martin K . Petersen" Cc: Bart Van Assche , Hannes Reinecke , Christoph Hellwig , Damien Le Moal Subject: [PATCH v2 5/7] sd_zbc: Rename sd_zbc_setup_write_cmnd Date: Mon, 24 Apr 2017 16:51:13 +0900 Message-Id: <20170424075115.30337-6-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170424075115.30337-1-damien.lemoal@wdc.com> References: <20170424075115.30337-1-damien.lemoal@wdc.com> MIME-Version: 1.0 X-Originating-IP: [199.255.44.173] X-ClientProxiedBy: BN6PR1401CA0004.namprd14.prod.outlook.com (10.174.237.142) To CY1PR04MB1980.namprd04.prod.outlook.com (10.166.191.16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f12be16-8097-4aa1-a77c-08d48ae6bdaf X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR04MB1980; X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 3:kOOasmZIpLhf+GwE7MaFJSowspqvoV+K+BY2Rvk4bNg8GJF8oebMG9jFXDvKuxIxOSFudD/AGPlDir40JFMIxb/DVIAfuMSJuJboW3rgsu2rJcDUrfqkv8PthwKPIKUMZFt7VBArwO7P5rCbuRzWOyfk4eNb6HGTt717d0PQgmerjVpyWlVewXe3XULI5h+l4zlG1jDdr5gukERhnZG5RiTNUMTDLSTq0ZfN20t78s8HwOtEZ68lSXUqvnVVib6zSsU8FlzWYnCU+UH2XMp3t3eSiU+ad60onMaL4N2XINHpwxvUiU7NFIIsB/AliDrDHEoJAuYPVEL8STRxw839S7Zc5BkSlGfawAPgYZg4S4k=; 25:HoJIEvJbTJTsnOyo4VjjWNXVRz8Mc1X+tiilOPd8nHL6Fa3oNS0ro5h8q734hCgGvZipomJJQyHkqrNEqxqSuuiBGcMFetVjUuZM5TjddKLj1d9Hs3YK6QinLpy3tNFe7yJb2pyzbm9V76h6zzJ0YRgf9FlkGoFJ+DXLsgF+ms9Lh23JQ2cogRMZZafP+/ljflqheiZgHrgV+jmXyE7m/0+izO4PVmhCh0GT4CWwTFbpSfOAsmFS6G/wGxro015Fm1xpPJvF6tATb8/21atm9NB49EupkCIebl6hQReTJdu6rC4EHbibrq4Cc5eVo+o9MxdhdeG+whpUoW5alUwycNTL4wWkmtOlYMeQ2SdHbWxGSu/Id/4pgMXWbhrCvgHdgOGMBTozR2Fypd0p9ZrM9vh8UuC5eOfA7LIXx68uA+xJR7+QIx9qHLIzcLauJoARkjR3/oPGn1ZlI1/gv33MrQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 31:x38MUyBJVqQfkWAYO0i/WjO+5ItXmQOiUuCdQKXXq37kOPYKyH58vuV5uki+yKpQDSrL3olgoqGytcY7+HD+E5JYxlUshY4AR411MbNIng9TKR/sRmK1PX0ZLOiJ0Qo94LVjUwsgT+yITKeZiSYxhREiFDSCJeR1zNT42BZdRY3TL0OrIaVZUs0obR9540Z3R2rVCr9t3lpWobP4vIGk2IiJr58f+VJ1TPpivWglfRs=; 20:nr9E6Q8MuGNxOsUllXTdY8xjpKyeKdxSbxPoTfa5gDi+NKYJtJPEpfmoNu3oyyL9Xql5jtEyiqH2zySk+d7As9b41WW2Gf7GvTr+Eye6bhM+pXCnU0aFh2E2wXyrBAbPDmXtWHuYSBCZASGTLSUpKdCIsC7jKk6/gKBJzNmPnn76Ju/949TKHtDjRnaQaPYHLisG0sAlv+tH8CqkSmI523QJ366Eu0c8vbbmNGH3V7kSKpAfGmzLXeEbYtkYt9mozDL9dxkfjOtBldCLRpRIy5CNx7bfiUQlbm/0sU6CeKg1Jf96sZ7YzVTcoevgyt5uwTqEmGplc8jgGCIaMZuJ9QV8/cgiNXveVv+Ad2Wtpa1dmLortxjzorj+Rw/7bv2lv8I/GqiqnhXphzIOy8dD8IE6N9zc3qCnsCWjf3oR/tNiYJJ/Qx1FgcdcpabTzhLQxM3aAZkqQRlbnS6qYGmuCyyLX6dgOHM9Qpc7mg2jKCMwihEyZlbFS3cfjdWvbE4U WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(42932892334569); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(6072148); SRVR:CY1PR04MB1980; BCL:0; PCL:0; RULEID:; SRVR:CY1PR04MB1980; X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 4:t+X/TY5Bol8/M1cRe8KoSQxN06uzyd5BgcIoD6zQJcgqWHHFvD4nuwiechXo3/7/Ce1qEL9j/ZHyAODPTD6jFBNAkVRSJg30aFY/kjb4Ddr50DKyE0JHDC8Cq+JJLhFRQltkdfyUFMYNC77Trou73mnvc1GMRSJlKkk3vI1a3H6Q7hydsQ+Hjz0N0rtT8+5Ox4g7xYBi38IbryAQATsBZw5I1OvySwSGz7bp17xMB7HKu++hDSRqfOsrxZ5CIgpPpoqy2UWZqOs3L7tvcPs2DzuA+263FaJZlfRCVhHwYo3YU0QABc2MTlH6JDGa6yy2/sfqv89NEuZ61NJPPTyw9uglhbWadHCHdShhK/2Pwr3ESzvnBdQiFAzqz6ZTK1rqYLa4BCrnJ2LcJbVORrKK6nb2WrK3y6hnjO+mXQxrb3om8DanyMTFh+IS+y7KNY/im1mY4S0BgOQ9OXqGifIwheStdHrpAOOZ0KPYjBO6jLfQNBt1aoYwFPr4Mksb9USBhpbZANTCg9cdJ6mB+/YHFWp8/9tgzli9SxEhFvUcQVZfFTQjLDxQ/5aOvpapKrEaVPef7/wbiLFQyz6HQ7k3/NvCeYcq+gDHAe3iziW2zR/vmEgH4AuPH1otRRlMQbpYaGiFkhhL/wroAdFIXUX9xtayG9ebM/odQII+6sJuoSAR6VsGBTkj/ZU1J/dHv1PdioZOnZnOHPzebd7fN2l0GBL9pDrG19+UuYZ1TnZbUovIkfbziRKmeFYIIkBsfEEZNuXB440E+S9nv7B8LvH32g== X-Forefront-PRVS: 0287BBA78D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39450400003)(39840400002)(39410400002)(39850400002)(39400400002)(39860400002)(33646002)(6512007)(9686003)(6666003)(81166006)(66066001)(8676002)(76176999)(7736002)(50986999)(305945005)(189998001)(50466002)(42186005)(6486002)(2950100002)(6916009)(47776003)(48376002)(54906002)(4326008)(2906002)(38730400002)(110136004)(5003940100001)(53936002)(25786009)(36756003)(86362001)(50226002)(1076002)(6116002)(3846002)(5660300001)(85782001)(85772001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR04MB1980; H:washi.fujisawa.hgst.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR04MB1980; 23:FqylZ9aXwxZf9HoS3+yc39kOQ+ZkWGrH17YiSNlbw?= =?us-ascii?Q?hj/TfC28+D6bftmRVZnHz1zP6X9Wjwdg9UAfOezoYSmtRPicFuAAZHQCQDde?= =?us-ascii?Q?0a4WEVZa4GexqO36BykWGg4h+R/Doi706MhahYmjOvN5rUMVI4MrCLMR4xip?= =?us-ascii?Q?9UWE7IxjlN/j4ufwynzBv8OEWhIWp6sJi2gG8eGWmZtwh20Th1eQfqkpdDpz?= =?us-ascii?Q?q8FaW+eL1lPRJ2qwHeLl9YnIWVEuwi468pMe8XO1gmRnm481IZ0t6cNtzYbY?= =?us-ascii?Q?VYRVhZdJqzFdj/xPw1n5Pao/OSLPftMZLrcR4ilgkR8kZTfjoXO64dr15j76?= =?us-ascii?Q?qlaRSY0vgvoJxShZUr0YwGQ+Bdo6Po3C8DAF/mX3LqaptBitFN7CjxQPXcpY?= =?us-ascii?Q?aGBWOqA50C2jIBtovu9g0Lnct6Z68EgOcauJL1+s3mMS8Kg338yOi5FrmRUS?= =?us-ascii?Q?aK2gPhWAd8qoeCQ6yLdZXI96D4VDRYXNp3wvLEa879jegA6Erymih5S6/okY?= =?us-ascii?Q?zeYQ+cagyRhsOOrseY4+ydbQvka+yFrrN+G1FqOo87409v8MpazdAetteljm?= =?us-ascii?Q?rQWw24Gn6iPoyYUkLUMN+j9pFGG7x/ABRegm8EseqZISjZAptRngBMYeMGnJ?= =?us-ascii?Q?fT1+l80A+zwkf/36CI43dX6GYTRe3IhiScxo2/7OMrBIL7bat6E0WpEBweNW?= =?us-ascii?Q?eMmoctkIZ+5hLlXf/8W9HvmkgykXWUbqgtLPE1dmWFHmjKS3Om5XEHAd8LQP?= =?us-ascii?Q?IcD7aY0T68PbD4wJeivaBFmJpwYpEguMdavoezTOz2rpH5IrwHiS2zq1FxAi?= =?us-ascii?Q?vYygOpI3D0Hzrd6w1dwWfDcdRadCO0Gnh2qeEntippeJRNZ1FT6qn9mVmnDs?= =?us-ascii?Q?1x+jB16fdKtGIhM+H7F3omKMiCNxXiQHma8stdktnRkQar87pjD4NabDBoPj?= =?us-ascii?Q?jnJNWmCb4FHGHXjrIiBfF1wdMoBIf03tpvks8xJo0A5HCwKPi9gmzTGmh2hN?= =?us-ascii?Q?86DzkOIG/We8mxUffmGPCqGOS1pFiSqhZ7VWnQ1/4AxUGbqCRQJ+OJ4p8ks8?= =?us-ascii?Q?2mUk7JG/fLLX8CfD773Zzw68iSArNZtyi25/wY2h/N+OyBN+guks0Nz8hTL2?= =?us-ascii?Q?+AURXkwP8E=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 6:0s59B+6crWwa4AITnCA8si1mPlzjgH+HPsKWXvqxkeNbxlaVCzvTv4WeCTfiL3J8c4Ku4EovjazRYCtUNjvzMGhpHT7uOKTM3iUGv5lfTqOPyzi9xBETLV0Dzz27TIHsnDrH5zo08kpCpbhQc6KGdN6zK3FmeH3BHIKQF/VramFcIkoIy6sbbmgctFlpwpurr5DHfOdyCUDMTyb+LAy10Mx3vVsOYLADQq+Psis8x3Im1u3tR+6UT8GPC3KvflxjU2H3Rhbdqqz5XQ4wGExYZwVJ+NO0LmNihJH6b7st1HnlJ4xxmARYkp0/bPD3G/ngeaISzqTgo/X2kBtwunOXNdvnIPsRr7c4pQwWqHTf9F62vj3YmsEZ7QZ2SpmeUAXdyEWWLQYkLiBUsbus4cgT63awUj3xxwgBUiRlS+2iZCGTN2bznpcQmjCMvSrFnSZhcaII5lhNM7oLPLcv59RVoZyLCJBuY4X439vRh8qrzFlq75xSINEqXgbkWGZ1znYkvVl0JBJbX7ljr/Q6c4fN3t7NtZocfXAtvFzF4FlPkuI=; 5:fLi0R4TXfsRuG6h1IUqPyAd9G63eEkxt4hUMuNQBbBHjlJP9TqDZLdE7owkwBsJwgQxVuZMlsfYSA88qZwpSQhEyHjBtCBfQ96FgJMqcN/k8tTKn+KP387V+XjZESuypdqdE18DblTd/bsuT8dMw2w==; 24:wrzXPpONq3pTd+6OJL7iaNba5u2fYPKvslzAudsefdTErkx1tBKv73zHvr5+K9KEya04w2dc+lZtEJ+WQqGWPpeP9dOvEf0Kcdm7H/BGhIc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR04MB1980; 7:UPsFy6HstKtpwQS6RSAj3ZwAkzCx0PSFPiJJi0oCWQvZvQ9V0UEpUffLHRTJn9uE0grwghMo3+D0bC5lX1mFuDdXOexTbkJiO8Z7/ks1SucxC2uvMfLw60hEHzMK5+uWQ1NJvmQn2R2yaCQUVjlRAJ5hJbJosyI1EQFq72LCjvuQpQDOQGaBFHPziG8rZpecONAB2DAPlnoVXTmloOpH5VNTfqq7ckYBUprGcaLO0Q+WoBNnUUdWLH6b8S1IBEuwC5wMX6s0DHT7rNNo/zSpFESrCziheXf5d8JEk40yPwloTzIZjya5tbOJkY9tfybqmVm/UEObHP86ettYeAuU4Q==; 20:robtX2MNjArZuHJikKUADLvX+ek5W69o1a0Iq6Yk5SE9qE9v1ZrnWQie0UU23J6vrx9xrAwkAuSkoxlQy6923Knao5hu+LD92Lbv2XCyMQabShE33zC8VuIC6BMEuibGEdDnzbcC2Y4ttoc+kU5Vf4DeSHJuiD3E4DnMIKvCS6s= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2017 07:51:37.4742 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR04MB1980 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: Damien Le Moal Rename sd_zbc_setup_write_cmnd() to sd_zbc_write_lock_zone() to be clear about what the function actually does. To be consistent, also rename sd_zbc_cancel_write_cmnd() to sd_zbc_write_unlock_zone(). No functional change is introduced by this patch. Signed-off-by: Damien Le Moal Reviewed-by: Bart Van Assche Reviewed-by: Christoph Hellwig --- drivers/scsi/sd.c | 6 +++--- drivers/scsi/sd.h | 8 ++++---- drivers/scsi/sd_zbc.c | 12 ++++-------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 2d1ac5c..25a4ab1 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -846,7 +846,7 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd) BUG_ON(bio_offset(bio) || bio_iovec(bio).bv_len != sdp->sector_size); if (sd_is_zoned(sdkp)) { - ret = sd_zbc_setup_write_cmnd(cmd); + ret = sd_zbc_write_lock_zone(cmd); if (ret != BLKPREP_OK) return ret; } @@ -918,7 +918,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt) unsigned char protect; if (zoned_write) { - ret = sd_zbc_setup_write_cmnd(SCpnt); + ret = sd_zbc_write_lock_zone(SCpnt); if (ret != BLKPREP_OK) return ret; } @@ -1145,7 +1145,7 @@ static int sd_setup_read_write_cmnd(struct scsi_cmnd *SCpnt) ret = BLKPREP_OK; out: if (zoned_write && ret != BLKPREP_OK) - sd_zbc_cancel_write_cmnd(SCpnt); + sd_zbc_write_unlock_zone(SCpnt); return ret; } diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 0cf9680..2044e07a 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -267,8 +267,8 @@ static inline int sd_is_zoned(struct scsi_disk *sdkp) extern int sd_zbc_read_zones(struct scsi_disk *sdkp, unsigned char *buffer); extern void sd_zbc_remove(struct scsi_disk *sdkp); extern void sd_zbc_print_zones(struct scsi_disk *sdkp); -extern int sd_zbc_setup_write_cmnd(struct scsi_cmnd *cmd); -extern void sd_zbc_cancel_write_cmnd(struct scsi_cmnd *cmd); +extern int sd_zbc_write_lock_zone(struct scsi_cmnd *cmd); +extern void sd_zbc_write_unlock_zone(struct scsi_cmnd *cmd); extern int sd_zbc_setup_report_cmnd(struct scsi_cmnd *cmd); extern int sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd); extern void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes, @@ -286,13 +286,13 @@ static inline void sd_zbc_remove(struct scsi_disk *sdkp) {} static inline void sd_zbc_print_zones(struct scsi_disk *sdkp) {} -static inline int sd_zbc_setup_write_cmnd(struct scsi_cmnd *cmd) +static inline int sd_zbc_write_lock_zone(struct scsi_cmnd *cmd) { /* Let the drive fail requests */ return BLKPREP_OK; } -static inline void sd_zbc_cancel_write_cmnd(struct scsi_cmnd *cmd) {} +static inline void sd_zbc_write_unlock_zone(struct scsi_cmnd *cmd) {} static inline int sd_zbc_setup_report_cmnd(struct scsi_cmnd *cmd) { diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c index 92620c8..a792682 100644 --- a/drivers/scsi/sd_zbc.c +++ b/drivers/scsi/sd_zbc.c @@ -269,7 +269,7 @@ int sd_zbc_setup_reset_cmnd(struct scsi_cmnd *cmd) return BLKPREP_OK; } -int sd_zbc_setup_write_cmnd(struct scsi_cmnd *cmd) +int sd_zbc_write_lock_zone(struct scsi_cmnd *cmd) { struct request *rq = cmd->request; struct scsi_disk *sdkp = scsi_disk(rq->rq_disk); @@ -303,8 +303,9 @@ int sd_zbc_setup_write_cmnd(struct scsi_cmnd *cmd) return BLKPREP_OK; } -static void sd_zbc_unlock_zone(struct request *rq) +void sd_zbc_write_unlock_zone(struct scsi_cmnd *cmd) { + struct request *rq = cmd->request; struct scsi_disk *sdkp = scsi_disk(rq->rq_disk); if (sdkp->zones_wlock) { @@ -315,11 +316,6 @@ static void sd_zbc_unlock_zone(struct request *rq) } } -void sd_zbc_cancel_write_cmnd(struct scsi_cmnd *cmd) -{ - sd_zbc_unlock_zone(cmd->request); -} - void sd_zbc_complete(struct scsi_cmnd *cmd, unsigned int good_bytes, struct scsi_sense_hdr *sshdr) @@ -333,7 +329,7 @@ void sd_zbc_complete(struct scsi_cmnd *cmd, case REQ_OP_ZONE_RESET: /* Unlock the zone */ - sd_zbc_unlock_zone(rq); + sd_zbc_write_unlock_zone(cmd); if (!result || sshdr->sense_key != ILLEGAL_REQUEST)