From:   Niklas Cassel <Niklas.Cassel@wdc.com>
To:     "James E.J. Bottomley" <jejb@linux.ibm.com>,
        "Martin K. Petersen" <martin.petersen@oracle.com>
CC:     "damien.lemoal@opensource.wdc.com" <damien.lemoal@opensource.wdc.com>,
        Niklas Cassel <Niklas.Cassel@wdc.com>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/2] scsi: sd_zbc: Compare against block layer enum values
Thread-Topic: [PATCH 1/2] scsi: sd_zbc: Compare against block layer enum
 values
Thread-Index: AQHX4sT1wmIgicv9UkS/qqm8MDen0Q==
Date:   Fri, 26 Nov 2021 12:55:59 +0000
Message-ID: <20211126125533.266015-1-Niklas.Cassel@wdc.com>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?FyO1E/JUh64aHiQOiFQSoxZQKDhJbuWZ0uAaWE/Z7ygpoaDE4gZCApBts8?=
 =?iso-8859-1?Q?ekiMy5jM0RgzU36/7faJ1vxamWX+r4qo8Yh39HAyoOVeGchiB6kVySG1oZ?=
 =?iso-8859-1?Q?zlPAOg+Rau8/sVhRkLEAMh9EfHTK5HScwvysP3NkwNkMCZs1sc7iNyPTG2?=
 =?iso-8859-1?Q?u3oOntqff0TDfZC2xlDJtZYXspJbq6+KQMeW33nLnzC+OJ3hv6Sl/18Q69?=
 =?iso-8859-1?Q?BrbRyDrO3LmEmDWErAQy4s/vZdwyKEPRNiTCwtGcN2zlmttkgPcW5EO4Ry?=
 =?iso-8859-1?Q?TwWPza3zZl73pG+ZRfFpioB0Isi0XZJpN9vA+q9owQOkFW0pPpebe1dRZg?=
 =?iso-8859-1?Q?mRnfdPtbvqwE7UvD9u03K7q546/AwWJjCEGc5JEGOXikojrweYuwwbt9Zs?=
 =?iso-8859-1?Q?JT+6BKloBInAR+mjk6eh/CI9xGEEe72oeC62fu5wBe3ZaOOO+ZES5SdRZJ?=
 =?iso-8859-1?Q?TJt++TTeiWRNz5d1NYWow1s6awgOg/ITQydK7luqPv5PrUWBN832blWjTN?=
 =?iso-8859-1?Q?HbAehKm6ai9wp6JAtyBN6+fNyzriiS0IwWdKYs2E4EJYGak71vsGlq7Syg?=
 =?iso-8859-1?Q?udDsaqsDgeLIpBWmTPrkPkpzIWw3Tt9nwa1XOMvcVlaAZYiAPFFsV+pjTb?=
 =?iso-8859-1?Q?2XiwJTM4yWny6wuheEyQ7kilLlGcAiFKLeYr1yJYkXanqJpWRKS1+VsZIl?=
 =?iso-8859-1?Q?GCXOS/evupOD53pOxmTsNIMwwnBQCwqAB7cJuyDOVQiNdTr2KfeRxOzADd?=
 =?iso-8859-1?Q?nxlj+Q+b+DkDsA7wF+1zisLEMqosmXJfVU1Qc27UDJFbnL8HRvLU08KLVR?=
 =?iso-8859-1?Q?vrnUYQ9swwOvEHNq2KmK3o7vLHSHQgvbk8uGjMMI06hALsScBbJPvNZJm2?=
 =?iso-8859-1?Q?mnWxQ3Dmr8Wj84Ti+2k3bYZPfz/kC6JLKr78dPS+uS9b/Xfif3drg8dnj7?=
 =?iso-8859-1?Q?yDRp/Dxxz0A9H46pNk4F5zWTdqEA6lohPci1zY/2B6GlWTlLEnc46xOGmT?=
 =?iso-8859-1?Q?u0c6qGIjXFmDq/jSCfbdsFEYJ6KSHe2ckwN21O/82WTuIDGYz0vWGNEyIi?=
 =?iso-8859-1?Q?E3yOuynPVmgKqtFoh+hKfGoj/29rEoKibLPE3aia3szJnFXUb8K+OqXyP3?=
 =?iso-8859-1?Q?Xw24OXruRjTKwl1WyggrUMxg+E9eI0nowhZ4yHFSBLcWFhGe2Qe/K0bUTM?=
 =?iso-8859-1?Q?qpM1UePIH0GSPPtHwRsgr1g40lWFh+y+sgZrUJr/MHyPbTvhj1lp7Vy9cS?=
 =?iso-8859-1?Q?lfXryOlQQf4OGRbz3vOjRxeFc6seVZwmw4jU3LZoRgVa/Pm/fQHea5maCB?=
 =?iso-8859-1?Q?pV+xq8N8ZCJ3UgiPqu+VqUTKCmrfhH+YFZJtfb0cO3RdZI4HVXy/pWbiYf?=
 =?iso-8859-1?Q?4Rji31rPYJ6rTjsb6ozut6N8pPyMPwBOmmjFD6zsua27BSrB/oDc4zjCJT?=
 =?iso-8859-1?Q?3YV3nOLKSHZBR4Vpg5GtSRNo92P44FEwbITLwRkkn8lw/dCTVHRAVa2ynQ?=
 =?iso-8859-1?Q?d70E+0p4MRnw9QhNAPb2dBdtH3H4qcMVzproiudn1h8rjs2tw3+eHLIsA5?=
 =?iso-8859-1?Q?wTe8Ue2N+UDQm1GdJx9RJ7oyL6KeO7AncjbS93kfLK8wpyO4YAZPfDQeWX?=
 =?iso-8859-1?Q?a2XvqV71dAokPUEpBDvYH2B/tpYZzNkjFZPgEZZfyOfess+Ez6cRGvVoTq?=
 =?iso-8859-1?Q?CHjaCa2yMJpbtqQSpR2ZURl4y1NERSP1jtjQUrg/?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: wdc.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH0PR04MB7158.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ac9545a-2374-489e-98d0-08d9b0dc182b
X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Nov 2021 12:55:59.3235
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: n6vCc1C0iKO8aRG+Qdl1PGA8k1WAALwoUNQNOMW+cefErRaIy+7LmIN2CXK6r/vPf9taFNse7GakKtJ3h3Eirg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR04MB7349
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Niklas Cassel <niklas.cassel@wdc.com>

sd_zbc_parse_report() fills in a struct blk_zone, which is the block layer
representation of a zone. This struct is also what will be copied to user
for a BLKREPORTZONE ioctl.

Since sd_zbc_parse_report() compares against zone.type and zone.cond, which
are members of a struct blk_zone, the correct enum values to compare
against are the enum values defined by the block layer.

These specific enum values for ZBC and the block layer happen to have the
same enum constants, but they could theoretically have been different.

Compare against the block layer enum values, to make it more obvious that
struct blk_zone is the block layer representation of a zone, and not the
SCSI/ZBC representation of a zone.

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
---
 drivers/scsi/sd_zbc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/sd_zbc.c b/drivers/scsi/sd_zbc.c
index ed06798983f8..024f1bec6e5a 100644
--- a/drivers/scsi/sd_zbc.c
+++ b/drivers/scsi/sd_zbc.c
@@ -62,8 +62,8 @@ static int sd_zbc_parse_report(struct scsi_disk *sdkp, u8=
 *buf,
 	zone.capacity =3D zone.len;
 	zone.start =3D logical_to_sectors(sdp, get_unaligned_be64(&buf[16]));
 	zone.wp =3D logical_to_sectors(sdp, get_unaligned_be64(&buf[24]));
-	if (zone.type !=3D ZBC_ZONE_TYPE_CONV &&
-	    zone.cond =3D=3D ZBC_ZONE_COND_FULL)
+	if (zone.type !=3D BLK_ZONE_TYPE_CONVENTIONAL &&
+	    zone.cond =3D=3D BLK_ZONE_COND_FULL)
 		zone.wp =3D zone.start + zone.len;
=20
 	ret =3D cb(&zone, idx, data);
--=20
2.33.1