diff mbox

scsi: Remove unnecessary condition in sd_read_block_limits()

Message ID 1505312986-14777-1-git-send-email-lczerner@redhat.com (mailing list archive)
State Accepted
Headers show

Commit Message

Lukas Czerner Sept. 13, 2017, 2:29 p.m. UTC 
After series of changes around WRITE_SAME and UNMAP setup we ended up
with leftover unnecessary condition. Remove it.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 drivers/scsi/sd.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Bart Van Assche Sept. 13, 2017, 5:32 p.m. UTC | #1 
On Wed, 2017-09-13 at 16:29 +0200, Lukas Czerner wrote:
> After series of changes around WRITE_SAME and UNMAP setup we ended up

> with leftover unnecessary condition. Remove it.


A similar patch was sitting in my tree and waiting to be posted. But since you
posted this first:

Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
diff mbox

Patch

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 11c1738..fb9f8b5 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2915,8 +2915,6 @@  static void sd_read_block_limits(struct scsi_disk *sdkp)
 				sd_config_discard(sdkp, SD_LBP_WS16);
 			else if (sdkp->lbpws10)
 				sd_config_discard(sdkp, SD_LBP_WS10);
-			else if (sdkp->lbpu && sdkp->max_unmap_blocks)
-				sd_config_discard(sdkp, SD_LBP_UNMAP);
 			else
 				sd_config_discard(sdkp, SD_LBP_DISABLE);
 		}