diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-04-13 12:02:17 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-04-13 12:02:17 +0800 |
commit | ad592b70ae97800d4f5bf535d45a680649e2789e (patch) | |
tree | 340a684df3e8dc3d893297f43c025c82e94cbb6a /drivers/scsi/sd.c | |
parent | f96884662e5ca42a3a39854454f5efd04342b48b (diff) | |
parent | b40108b826ed9e1c558f73b9dbabb8d80ded268b (diff) |
Merge tag 'v4.4.7' into linux-linaro-lsk-v4.4
This is the 4.4.7 stable release
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index bb669d32ccd0..cc84ea7d09cc 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -648,7 +648,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode) */ if (sdkp->lbprz) { q->limits.discard_alignment = 0; - q->limits.discard_granularity = 1; + q->limits.discard_granularity = logical_block_size; } else { q->limits.discard_alignment = sdkp->unmap_alignment * logical_block_size; |