Commit b3491b0d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

sd: simplify the ZBC case in provisioning_mode_store 



Don't reset the discard settings to no-op over and over when a user
writes to the provisioning attribute as that is already the default
mode for ZBC devices.  In hindsight we should have made writing to
the attribute fail for ZBC devices, but the code has probably been
around for far too long to change this now.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240531074837.1648501-6-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a2363464

drivers/scsi/sd.c

+4 −5
Original line number Diff line number Diff line
@@ -461,14 +461,13 @@ provisioning_mode_store(struct device *dev, struct device_attribute *attr, 
	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;



	if (sd_is_zoned(sdkp)) {

		sd_config_discard(sdkp, SD_LBP_DISABLE);

		return count;

	}



	if (sdp->type != TYPE_DISK)

		return -EINVAL;



	/* ignore the provisioning mode for ZBC devices */

	if (sd_is_zoned(sdkp))

		return count;



	mode = sysfs_match_string(lbp_mode, buf);

	if (mode < 0)

		return -EINVAL;