diff options
author | Lukas Czerner <lczerner@redhat.com> | 2017-09-13 10:29:46 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-09-15 15:14:28 -0400 |
commit | 9c95be0163a0a699ed7eda4727f485f8453580ef (patch) | |
tree | bb3e10b47e2215c6006f16f1b8e90e8f98ea37b1 /drivers | |
parent | fd536998314a9dc54f384fa16287321edb81602a (diff) |
scsi: sd: Remove unnecessary condition in sd_read_block_limits()
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>
Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 11c1738c2100..fb9f8b5f4673 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) | |||
2915 | sd_config_discard(sdkp, SD_LBP_WS16); | 2915 | sd_config_discard(sdkp, SD_LBP_WS16); |
2916 | else if (sdkp->lbpws10) | 2916 | else if (sdkp->lbpws10) |
2917 | sd_config_discard(sdkp, SD_LBP_WS10); | 2917 | sd_config_discard(sdkp, SD_LBP_WS10); |
2918 | else if (sdkp->lbpu && sdkp->max_unmap_blocks) | ||
2919 | sd_config_discard(sdkp, SD_LBP_UNMAP); | ||
2920 | else | 2918 | else |
2921 | sd_config_discard(sdkp, SD_LBP_DISABLE); | 2919 | sd_config_discard(sdkp, SD_LBP_DISABLE); |
2922 | } | 2920 | } |