Commit 6540a65d authored Mar 05, 2016 by Martin K. Petersen

sd: Fix discard granularity when LBPRZ=1



Commit 39773722 ("sd: Make discard granularity match logical block
size when LBPRZ=1") accidentally set the granularity to one byte instead
of one logical block on devices that provide deterministic zeroes after
UNMAP.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reported-by: Mike Snitzer <snitzer@redhat.com>
Reviewed-by: Ewan Milne <emilne@redhat.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Fixes: 39773722
Cc: <stable@vger.kernel.org> #v4.4+

parent 21b81716

drivers/scsi/sd.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -648,7 +648,7 @@ static void sd_config_discard(struct scsi_disk *sdkp, unsigned int mode)
	*/		*/
	if (sdkp->lbprz) {		if (sdkp->lbprz) {
	q->limits.discard_alignment = 0;		q->limits.discard_alignment = 0;
	q->limits.discard_granularity = 1;		q->limits.discard_granularity = logical_block_size;
	} else {		} else {
	q->limits.discard_alignment = sdkp->unmap_alignment *		q->limits.discard_alignment = sdkp->unmap_alignment *
	logical_block_size;		logical_block_size;