diff options
author | john fastabend <john.r.fastabend@intel.com> | 2010-11-30 19:18:49 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-21 13:24:22 -0500 |
commit | 05fee645e96e732a79ad083cab8ddd4efd108e2c (patch) | |
tree | 597d8d29d6f53261ebd46b3a925187075482b426 /drivers/scsi/libfc/fc_fcp.c | |
parent | e0883a3c3e7766b390971a49bf728004816c9520 (diff) |
[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>
Diffstat (limited to 'drivers/scsi/libfc/fc_fcp.c')
-rw-r--r-- | drivers/scsi/libfc/fc_fcp.c | 5 |
1 files changed, 2 insertions, 3 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, | |||
1150 | 1150 | ||
1151 | setup_timer(&fsp->timer, fc_fcp_timeout, (unsigned long)fsp); | 1151 | setup_timer(&fsp->timer, fc_fcp_timeout, (unsigned long)fsp); |
1152 | 1152 | ||
1153 | if (fsp->tgt_flags & FC_RP_FLAGS_REC_SUPPORTED) | 1153 | if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED) |
1154 | fc_fcp_timer_set(fsp, rec_tov); | 1154 | fc_fcp_timer_set(fsp, rec_tov); |
1155 | |||
1155 | unlock: | 1156 | unlock: |
1156 | fc_fcp_unlock_pkt(fsp); | 1157 | fc_fcp_unlock_pkt(fsp); |
1157 | return rc; | 1158 | return rc; |
@@ -1867,8 +1868,6 @@ static int fc_queuecommand_lck(struct scsi_cmnd *sc_cmd, void (*done)(struct scs | |||
1867 | } | 1868 | } |
1868 | put_cpu(); | 1869 | put_cpu(); |
1869 | 1870 | ||
1870 | fsp->tgt_flags = rpriv->flags; | ||
1871 | |||
1872 | init_timer(&fsp->timer); | 1871 | init_timer(&fsp->timer); |
1873 | fsp->timer.data = (unsigned long)fsp; | 1872 | fsp->timer.data = (unsigned long)fsp; |
1874 | 1873 | ||