diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-03-15 15:24:44 -0700 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-03-15 15:24:44 -0700 |
| commit | a7dee8f45fa2948b74d8e84ba24e435c87fd0acf (patch) | |
| tree | 06ec1c93334f581e341cf74f5639ce645266fc14 /drivers/scsi/sd.c | |
| parent | 7ee7895c93d1d6cafad2f5d187f0a9369e91eaec (diff) | |
| parent | 5ecee0a3ee8d74b6950cb41e8989b0c2174568d4 (diff) | |
| download | linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.tar.gz linux-a7dee8f45fa2948b74d8e84ba24e435c87fd0acf.tar.xz | |
Merge branch 'fixes' into misc
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 d749da765df1..5a5457ac9cdb 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; |