diff options
author | Christoph Hellwig <hch@lst.de> | 2016-09-11 13:35:40 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2016-09-15 09:41:56 -0400 |
commit | 27c0e83b273a637d5cb56f02550c31d803bafc10 (patch) | |
tree | 77d5c58b387b8a953252703f36ae5632106d3be6 | |
parent | 6ebf105cc047f3877ac530cd19d13b3e788ab02e (diff) |
scsi: qla2xxx: Use struct t10_pi_tuple
Instead of defining a local version of it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/qla2xxx/qla_def.h | 10 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_isr.c | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index ae4a74756128..73b12e41d992 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -279,16 +279,6 @@ struct req_que; | |||
279 | struct qla_tgt_sess; | 279 | struct qla_tgt_sess; |
280 | 280 | ||
281 | /* | 281 | /* |
282 | * (sd.h is not exported, hence local inclusion) | ||
283 | * Data Integrity Field tuple. | ||
284 | */ | ||
285 | struct sd_dif_tuple { | ||
286 | __be16 guard_tag; /* Checksum */ | ||
287 | __be16 app_tag; /* Opaque storage */ | ||
288 | __be32 ref_tag; /* Target LBA or indirect LBA */ | ||
289 | }; | ||
290 | |||
291 | /* | ||
292 | * SCSI Request Block | 282 | * SCSI Request Block |
293 | */ | 283 | */ |
294 | struct srb_cmd { | 284 | struct srb_cmd { |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 987f1c729e9c..068c4e47fac9 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
@@ -1828,7 +1828,7 @@ qla2x00_handle_dif_error(srb_t *sp, struct sts_entry_24xx *sts24) | |||
1828 | if (scsi_prot_sg_count(cmd)) { | 1828 | if (scsi_prot_sg_count(cmd)) { |
1829 | uint32_t i, j = 0, k = 0, num_ent; | 1829 | uint32_t i, j = 0, k = 0, num_ent; |
1830 | struct scatterlist *sg; | 1830 | struct scatterlist *sg; |
1831 | struct sd_dif_tuple *spt; | 1831 | struct t10_pi_tuple *spt; |
1832 | 1832 | ||
1833 | /* Patch the corresponding protection tags */ | 1833 | /* Patch the corresponding protection tags */ |
1834 | scsi_for_each_prot_sg(cmd, sg, | 1834 | scsi_for_each_prot_sg(cmd, sg, |