Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05fee645 authored by john fastabend's avatar john fastabend Committed by James Bottomley
Browse files

[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: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent e0883a3c

drivers/scsi/libfc/fc_fcp.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

include/scsi/libfc.h

+0 −2
Original line number Diff line number Diff line
@@ -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;