android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] libfc: remove tgt_flags from fc_fcp_pkt struct

Browse Source 
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>
This commit is contained in:
john fastabend 2010-11-30 16:18:49 -08:00 committed by James Bottomley
parent e0883a3c3e
commit 05fee645e9
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/libfc/fc_fcp.c
View File

@ -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); 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); fc_fcp_timer_set(fsp, rec_tov);
unlock: unlock:
fc_fcp_unlock_pkt(fsp); fc_fcp_unlock_pkt(fsp);
return rc; return rc;
@ -1867,8 +1868,6 @@ static int fc_queuecommand_lck(struct scsi_cmnd *sc_cmd, void (*done)(struct scs
} }
put_cpu(); put_cpu();
fsp->tgt_flags = rpriv->flags;
init_timer(&fsp->timer); init_timer(&fsp->timer);
fsp->timer.data = (unsigned long)fsp; fsp->timer.data = (unsigned long)fsp;

2
include/scsi/libfc.h
View File

@ -263,7 +263,6 @@ struct fc_seq_els_data {
* struct fc_fcp_pkt - FCP request structure (one for each scsi_cmnd request) * struct fc_fcp_pkt - FCP request structure (one for each scsi_cmnd request)
* @lp: The associated local port * @lp: The associated local port
* @state: The state of the I/O * @state: The state of the I/O
* @tgt_flags: Target's flags
* @ref_cnt: Reference count * @ref_cnt: Reference count
* @scsi_pkt_lock: Lock to protect the SCSI packet (must be taken before the * @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) * host_lock if both are to be held at the same time)
@ -298,7 +297,6 @@ struct fc_fcp_pkt {
/* Housekeeping information */ /* Housekeeping information */
struct fc_lport *lp; struct fc_lport *lp;
u16 state; u16 state;
u16 tgt_flags;
atomic_t ref_cnt; atomic_t ref_cnt;
spinlock_t scsi_pkt_lock; spinlock_t scsi_pkt_lock;