diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2012-08-28 14:29:33 -0400 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-24 12:10:59 +0400 |
| commit | 8c579ab69d50a416887390ba4b89598a7b2fa0b6 (patch) | |
| tree | 11a552e7ebcc13c1a15ca764da04bece358d26a1 /drivers/scsi/sd.c | |
| parent | b656688a90175d4c424a2f02264863ede7e82d7b (diff) | |
| download | lwn-8c579ab69d50a416887390ba4b89598a7b2fa0b6.tar.gz lwn-8c579ab69d50a416887390ba4b89598a7b2fa0b6.zip | |
[SCSI] sd: Avoid remapping bad reference tags
It does not make sense to translate ref tags with unexpected values.
Instead we simply ignore them and let the upper layers catch the
problem. Ref tags that contain the expected value are still remapped.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 4df73e52a4f9..9f7fc39891b8 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -804,9 +804,8 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq) SCpnt->cmnd[0] = WRITE_6; SCpnt->sc_data_direction = DMA_TO_DEVICE; - if (blk_integrity_rq(rq) && - sd_dif_prepare(rq, block, sdp->sector_size) == -EIO) - goto out; + if (blk_integrity_rq(rq)) + sd_dif_prepare(rq, block, sdp->sector_size); } else if (rq_data_dir(rq) == READ) { SCpnt->cmnd[0] = READ_6; |