From: Christoph Hellwig <hch@lst.de>
To: martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org
Subject: [PATCH 2/3] qla2xxx: use struct t10_pi_tuple
Date: Sun, 11 Sep 2016 19:35:40 +0200 [thread overview]
Message-ID: <1473615341-27203-3-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1473615341-27203-1-git-send-email-hch@lst.de>
Instead of defining a local version of it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/scsi/qla2xxx/qla_def.h | 10 ----------
drivers/scsi/qla2xxx/qla_isr.c | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index ae4a747..73b12e4 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -279,16 +279,6 @@ struct req_que;
struct qla_tgt_sess;
/*
- * (sd.h is not exported, hence local inclusion)
- * Data Integrity Field tuple.
- */
-struct sd_dif_tuple {
- __be16 guard_tag; /* Checksum */
- __be16 app_tag; /* Opaque storage */
- __be32 ref_tag; /* Target LBA or indirect LBA */
-};
-
-/*
* SCSI Request Block
*/
struct srb_cmd {
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index 987f1c7..068c4e4 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)
if (scsi_prot_sg_count(cmd)) {
uint32_t i, j = 0, k = 0, num_ent;
struct scatterlist *sg;
- struct sd_dif_tuple *spt;
+ struct t10_pi_tuple *spt;
/* Patch the corresponding protection tags */
scsi_for_each_prot_sg(cmd, sg,
--
2.1.4
next prev parent reply other threads:[~2016-09-11 17:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-11 17:35 consolidate T10 PI defintions Christoph Hellwig
2016-09-11 17:35 ` [PATCH 1/3] scsi_debug: use struct t10_pi_tuple instead of struct sd_dif_tuple Christoph Hellwig
2016-09-13 7:37 ` Bart Van Assche
2016-09-11 17:35 ` Christoph Hellwig [this message]
2016-09-13 7:38 ` [PATCH 2/3] qla2xxx: use struct t10_pi_tuple Bart Van Assche
2016-09-11 17:35 ` [PATCH 3/3] sd: move DIF protection types to t10-pi.h Christoph Hellwig
2016-09-13 7:40 ` Bart Van Assche
2016-09-14 18:34 ` Martin K. Petersen
2016-09-15 5:10 ` Christoph Hellwig
2016-09-15 13:54 ` Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473615341-27203-3-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).