Skip to content

Commit

Permalink
sd: simplify the ZBC case in provisioning_mode_store
Browse files Browse the repository at this point in the history
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240531074837.1648501-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Christoph Hellwig authored and Jens Axboe committed Jun 14, 2024
1 parent a236346 commit b3491b0
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/scsi/sd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b3491b0

Please sign in to comment.