From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0806725C6EE; Thu, 20 Aug 2026 16:48:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787244524; cv=none; b=M7Z12RUaOqTvvV6hNX25fHRbi5RImK3j0iK/ADkH9ONyC0vnI5aSOnW2d2jF9IaJgK945VWR54lRn/SvFPDzsgOmM/klzrQYVCPO5VWQ2MmhmD+s6KMt9T664qPwAtnt9gWYAJDCkYP7zrtm6FgZ4js79/J10W58a5hvPz46On4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787244524; c=relaxed/simple; bh=JgW1o9rKeq69bQ3It8LeIg6gKgX9swUSK/BWfr9PyeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aaOenmCBZt+at+YdALIQcAOekhRcohnAqcMGV/qPVFMFhmAM8CAcqwgkdkdZNB/bOeoUTHLCz2PEvMQwpbi+UYbvBmkuRaRQmIk3+wEGpdI8Sf9cwFQ4jJ9jmvXgqKfjqh1JR7VvToBHnZgpFPNNkksC/sM1ic3YvsOAmPNNIKA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PF7vZOrt; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PF7vZOrt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 649FF1F000E9; Thu, 20 Aug 2026 16:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787244522; bh=J2TSr20MtvAJF0Ug0T5WL7Z/qUBIl5+SAUYknMKh6UI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PF7vZOrtmBErJMKp7I+8Ae3MiZocSG6wPfSMgm9+uGUj1W52aEqVAEQUfwQDfF26l c4ONiYtcnz+1DaIs+V3DWkBw1MPm9DBe8bXTFdyvt2eXmeYTV08+1yJImUFeoowOVd qO9EP48/fhQ5ZPR9kVWf+hVxzVelGfz35VUmI4q0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Douglas Gilbert , Damien Le Moal , Bart Van Assche , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.10 198/235] scsi: scsi_debug: Rename zone type constants Date: Thu, 20 Aug 2026 16:57:14 +0200 Message-ID: <20260820145222.560744067@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145216.426568665@linuxfoundation.org> References: <20260820145216.426568665@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Damien Le Moal [ Upstream commit 35dbe2b9a7b0c92777c855c6a2cca8390f4c166b ] Rename the scsi_debug zone type constants to prevent a conflict with the ZBC_ZONE_TYPE_GAP constant from include/scsi/scsi_proto.h. Link: https://lore.kernel.org/r/20220421183023.3462291-9-bvanassche@acm.org Cc: Douglas Gilbert Acked-by: Douglas Gilbert Signed-off-by: Damien Le Moal [ bvanassche: Extracted these changes from a larger patch ] Signed-off-by: Bart Van Assche Signed-off-by: Martin K. Petersen Stable-dep-of: 93dde0bf2f39 ("scsi: scsi_debug: Fix REPORT ZONES alloc_len underflow OOB write") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/scsi_debug.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -250,9 +250,9 @@ static const char *sdebug_version_date = /* Zone types (zbcr05 table 25) */ enum sdebug_z_type { - ZBC_ZONE_TYPE_CNV = 0x1, - ZBC_ZONE_TYPE_SWR = 0x2, - ZBC_ZONE_TYPE_SWP = 0x3, + ZBC_ZTYPE_CNV = 0x1, + ZBC_ZTYPE_SWR = 0x2, + ZBC_ZTYPE_SWP = 0x3, }; /* enumeration names taken from table 26, zbcr05 */ @@ -2681,7 +2681,7 @@ static struct sdeb_zone_state *zbc_zone( static inline bool zbc_zone_is_conv(struct sdeb_zone_state *zsp) { - return zsp->z_type == ZBC_ZONE_TYPE_CNV; + return zsp->z_type == ZBC_ZTYPE_CNV; } static void zbc_close_zone(struct sdebug_dev_info *devip, @@ -2780,7 +2780,7 @@ static void zbc_inc_wp(struct sdebug_dev if (zbc_zone_is_conv(zsp)) return; - if (zsp->z_type == ZBC_ZONE_TYPE_SWR) { + if (zsp->z_type == ZBC_ZTYPE_SWR) { zsp->z_wp += num; if (zsp->z_wp >= zend) zbc_set_zone_full(devip, zsp); @@ -2847,7 +2847,7 @@ static int check_zbc_access_params(struc return 0; } - if (zsp->z_type == ZBC_ZONE_TYPE_SWR) { + if (zsp->z_type == ZBC_ZTYPE_SWR) { /* Writes cannot cross sequential zone boundaries */ if (zsp_end != zsp) { mk_sense_buffer(scp, ILLEGAL_REQUEST, @@ -4913,14 +4913,14 @@ static int sdebug_device_create_zones(st zsp->z_start = zstart; if (i < devip->nr_conv_zones) { - zsp->z_type = ZBC_ZONE_TYPE_CNV; + zsp->z_type = ZBC_ZTYPE_CNV; zsp->z_cond = ZBC_NOT_WRITE_POINTER; zsp->z_wp = (sector_t)-1; } else { if (devip->zmodel == BLK_ZONED_HM) - zsp->z_type = ZBC_ZONE_TYPE_SWR; + zsp->z_type = ZBC_ZTYPE_SWR; else - zsp->z_type = ZBC_ZONE_TYPE_SWP; + zsp->z_type = ZBC_ZTYPE_SWP; zsp->z_cond = ZC1_EMPTY; zsp->z_wp = zsp->z_start; }