mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
target: Use struct t10_pi_tuple
Its not a good idea to keep target specific definition of the same t10-pi tuple. (Fix v4.2-rc1 patch fuzz - nab) Signed-off-by: Sagi Grimberg <[email protected]> Signed-off-by: Nicholas Bellinger <[email protected]>
This commit is contained in:
parent
1c4c7159ed
commit
fe052a1810
3 changed files with 7 additions and 12 deletions
|
|
@ -754,7 +754,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
|
|||
dev->dev_link_magic = SE_DEV_LINK_MAGIC;
|
||||
dev->se_hba = hba;
|
||||
dev->transport = hba->backend->ops;
|
||||
dev->prot_length = sizeof(struct se_dif_v1_tuple);
|
||||
dev->prot_length = sizeof(struct t10_pi_tuple);
|
||||
dev->hba_index = hba->hba_index;
|
||||
|
||||
INIT_LIST_HEAD(&dev->dev_list);
|
||||
|
|
|
|||
|
|
@ -1191,7 +1191,7 @@ void
|
|||
sbc_dif_generate(struct se_cmd *cmd)
|
||||
{
|
||||
struct se_device *dev = cmd->se_dev;
|
||||
struct se_dif_v1_tuple *sdt;
|
||||
struct t10_pi_tuple *sdt;
|
||||
struct scatterlist *dsg = cmd->t_data_sg, *psg;
|
||||
sector_t sector = cmd->t_task_lba;
|
||||
void *daddr, *paddr;
|
||||
|
|
@ -1203,7 +1203,7 @@ sbc_dif_generate(struct se_cmd *cmd)
|
|||
daddr = kmap_atomic(sg_page(dsg)) + dsg->offset;
|
||||
|
||||
for (j = 0; j < psg->length;
|
||||
j += sizeof(struct se_dif_v1_tuple)) {
|
||||
j += sizeof(*sdt)) {
|
||||
__u16 crc;
|
||||
unsigned int avail;
|
||||
|
||||
|
|
@ -1256,7 +1256,7 @@ sbc_dif_generate(struct se_cmd *cmd)
|
|||
}
|
||||
|
||||
static sense_reason_t
|
||||
sbc_dif_v1_verify(struct se_cmd *cmd, struct se_dif_v1_tuple *sdt,
|
||||
sbc_dif_v1_verify(struct se_cmd *cmd, struct t10_pi_tuple *sdt,
|
||||
__u16 crc, sector_t sector, unsigned int ei_lba)
|
||||
{
|
||||
__be16 csum;
|
||||
|
|
@ -1346,7 +1346,7 @@ sbc_dif_verify(struct se_cmd *cmd, sector_t start, unsigned int sectors,
|
|||
unsigned int ei_lba, struct scatterlist *psg, int psg_off)
|
||||
{
|
||||
struct se_device *dev = cmd->se_dev;
|
||||
struct se_dif_v1_tuple *sdt;
|
||||
struct t10_pi_tuple *sdt;
|
||||
struct scatterlist *dsg = cmd->t_data_sg;
|
||||
sector_t sector = start;
|
||||
void *daddr, *paddr;
|
||||
|
|
@ -1361,7 +1361,7 @@ sbc_dif_verify(struct se_cmd *cmd, sector_t start, unsigned int sectors,
|
|||
|
||||
for (i = psg_off; i < psg->length &&
|
||||
sector < start + sectors;
|
||||
i += sizeof(struct se_dif_v1_tuple)) {
|
||||
i += sizeof(*sdt)) {
|
||||
__u16 crc;
|
||||
unsigned int avail;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue