diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-04 21:37:52 -0800 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-02-04 21:37:52 -0800 |
| commit | 12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6 (patch) | |
| tree | b8fe38b24a2070d5b0cb2279f86e98b6dce98c46 /drivers/scsi/sd.c | |
| parent | 6344a5cd3e8acf6e9823046cebd00b16faacdb1a (diff) | |
| parent | 0fb5b1fb30fba3671dd5b1489d78e93e08d62e4e (diff) | |
| download | linux-12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6.tar.gz linux-12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6.tar.bz2 linux-12ffbbe94d8c0186daccc2e61d5ff87b15aa7bc6.zip | |
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index bb669d32ccd0..d749da765df1 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -761,7 +761,7 @@ static int sd_setup_discard_cmnd(struct scsi_cmnd *cmd) break; default: - ret = BLKPREP_KILL; + ret = BLKPREP_INVALID; goto out; } @@ -839,7 +839,7 @@ static int sd_setup_write_same_cmnd(struct scsi_cmnd *cmd) int ret; if (sdkp->device->no_write_same) - return BLKPREP_KILL; + return BLKPREP_INVALID; BUG_ON(bio_offset(bio) || bio_iovec(bio).bv_len != sdp->sector_size); |