path: root/drivers/scsi/scsi_scan.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2017-10-07 12:34:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-10-07 12:34:16 -0700
commit85b1bb248071967135d22cc84e62292094f4a3c6 (patch)
tree45b9d706a141322ad051213c5d3d118feddb09a2 /drivers/scsi/scsi_scan.c
parent67936a41e597331c991528c5e5bd791cfbb1b1d6 (diff)
parent88e65389fce1f68ba6d13ae2fc0f8d7e5c338c52 (diff)
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: - a couple of serious fixes: use after free and blacklist for WRITE SAME - one error leg fix: write_pending failure - one user experience problem: do not override max_sectors_kb - one minor unused function removal * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: ibmvscsis: Fix write_pending failure path scsi: libiscsi: Remove iscsi_destroy_session scsi: libiscsi: Fix use-after-free race during iscsi_session_teardown scsi: sd: Do not override max_sectors_kb sysfs setting scsi: sd: Implement blacklist option for WRITE SAME w/ UNMAP
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index e7818afeda2b..15590a063ad9 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -956,6 +956,9 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
if (*bflags & BLIST_NO_DIF)
sdev->no_dif = 1;
+ if (*bflags & BLIST_UNMAP_LIMIT_WS)
+ sdev->unmap_limit_for_ws = 1;
sdev->eh_timeout = SCSI_DEFAULT_EH_TIMEOUT;
if (*bflags & BLIST_TRY_VPD_PAGES)