diff options
| author |   john fastabend <john.r.fastabend@intel.com> | 2010-11-30 16:18:49 -0800 |
|---|---|---|
| committer |   James Bottomley <James.Bottomley@suse.de> | 2010-12-21 12:24:22 -0600 |
| commit | 05fee645e96e732a79ad083cab8ddd4efd108e2c (patch) | |
| tree | 597d8d29d6f53261ebd46b3a925187075482b426 | |
| parent | [SCSI] libfc: use rport timeout values for fcp recovery (diff) | |
| download | linux-dev-05fee645e96e732a79ad083cab8ddd4efd108e2c.tar.xz linux-dev-05fee645e96e732a79ad083cab8ddd4efd108e2c.zip | |
[SCSI] libfc: remove tgt_flags from fc_fcp_pkt struct
We can easily remove the tgt_flags from fc_fcp_pkt struct
and use rpriv->tgt_flags directly where needed.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/libfc/fc_fcp.c | 5 | ||||
| -rw-r--r-- | include/scsi/libfc.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index a7d956ad16e3..a36c652edbba 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c @@ -1150,8 +1150,9 @@ static int fc_fcp_cmd_send(struct fc_lport *lport, struct fc_fcp_pkt *fsp, setup_timer(&fsp->timer, fc_fcp_timeout, (unsigned long)fsp); - if (fsp->tgt_flags & FC_RP_FLAGS_REC_SUPPORTED) + if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED) fc_fcp_timer_set(fsp, rec_tov); + unlock: fc_fcp_unlock_pkt(fsp); return rc; @@ -1867,8 +1868,6 @@ static int fc_queuecommand_lck(struct scsi_cmnd *sc_cmd, void (*done)(struct scs } put_cpu(); - fsp->tgt_flags = rpriv->flags; - init_timer(&fsp->timer); fsp->timer.data = (unsigned long)fsp; diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h index 5c4c1678f7be..3eb3915eb557 100644 --- a/include/scsi/libfc.h +++ b/include/scsi/libfc.h @@ -263,7 +263,6 @@ struct fc_seq_els_data { * struct fc_fcp_pkt - FCP request structure (one for each scsi_cmnd request) * @lp: The associated local port * @state: The state of the I/O - * @tgt_flags: Target's flags * @ref_cnt: Reference count * @scsi_pkt_lock: Lock to protect the SCSI packet (must be taken before the * host_lock if both are to be held at the same time) @@ -298,7 +297,6 @@ struct fc_fcp_pkt { /* Housekeeping information */ struct fc_lport *lp; u16 state; - u16 tgt_flags; atomic_t ref_cnt; spinlock_t scsi_pkt_lock; |