Skip to content

Commit

Permalink
[SCSI] libfc: change elsct to use FC_ID instead of rdata
Browse files Browse the repository at this point in the history 
tt.elsct_send is used by both FCP and by the rport state machine.
After further patches, these two modules will use different
structures for the remote port.

So, change elsct_send to use the FC_ID instead of the fc_rport_priv
as its argument.  It currently only uses the FC_ID anyway.

For CT requests the destination FC_ID is still implicitly 0xfffffc.
After further patches the did arg on CT requests will be used to
specify the FC_ID being inquired about for GPN_ID or other queries.

Signed-off-by: Joe Eykholt <[email protected]>
Signed-off-by: Robert Love <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
  • Loading branch information
Joe Eykholt authored and James Bottomley committed Sep 10, 2009
1 parent 9fb9d32 commit a46f327
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 39 deletions.
2 changes: 1 addition & 1 deletion drivers/scsi/libfc/fc_disc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ static void fc_disc_gpn_ft_req(struct fc_disc *disc)
if (!fp)
goto err;

if (lport->tt.elsct_send(lport, NULL, fp,
if (lport->tt.elsct_send(lport, 0, fp,
FC_NS_GPN_FT,
fc_disc_gpn_ft_resp,
disc, lport->e_d_tov))
Expand Down
11 changes: 6 additions & 5 deletions drivers/scsi/libfc/fc_elsct.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* fc_elsct_send - sends ELS/CT frame
*/
static struct fc_seq *fc_elsct_send(struct fc_lport *lport,
struct fc_rport_priv *rdata,
u32 did,
struct fc_frame *fp,
unsigned int op,
void (*resp)(struct fc_seq *,
Expand All @@ -41,16 +41,17 @@ static struct fc_seq *fc_elsct_send(struct fc_lport *lport,
void *arg, u32 timer_msec)
{
enum fc_rctl r_ctl;
u32 did = FC_FID_NONE;
enum fc_fh_type fh_type;
int rc;

/* ELS requests */
if ((op >= ELS_LS_RJT) && (op <= ELS_AUTH_ELS))
rc = fc_els_fill(lport, rdata, fp, op, &r_ctl, &did, &fh_type);
else
rc = fc_els_fill(lport, did, fp, op, &r_ctl, &fh_type);
else {
/* CT requests */
rc = fc_ct_fill(lport, fp, op, &r_ctl, &did, &fh_type);
rc = fc_ct_fill(lport, fp, op, &r_ctl, &fh_type);
did = FC_FID_DIR_SERV;
}

if (rc)
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/libfc/fc_fcp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1308,7 +1308,7 @@ static void fc_fcp_rec(struct fc_fcp_pkt *fsp)
fc_fill_fc_hdr(fp, FC_RCTL_ELS_REQ, rport->port_id,
fc_host_port_id(rp->local_port->host), FC_TYPE_ELS,
FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);
if (lp->tt.elsct_send(lp, rport->dd_data, fp, ELS_REC, fc_fcp_rec_resp,
if (lp->tt.elsct_send(lp, rport->port_id, fp, ELS_REC, fc_fcp_rec_resp,
fsp, jiffies_to_msecs(FC_SCSI_REC_TOV))) {
fc_fcp_pkt_hold(fsp); /* hold while REC outstanding */
return;
Expand Down
12 changes: 6 additions & 6 deletions drivers/scsi/libfc/fc_lport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ static void fc_lport_enter_scr(struct fc_lport *lport)
return;
}

if (!lport->tt.elsct_send(lport, NULL, fp, ELS_SCR,
if (!lport->tt.elsct_send(lport, FC_FID_FCTRL, fp, ELS_SCR,
fc_lport_scr_resp, lport, lport->e_d_tov))
fc_lport_error(lport, fp);
}
Expand Down Expand Up @@ -1258,7 +1258,7 @@ static void fc_lport_enter_rft_id(struct fc_lport *lport)
return;
}

if (!lport->tt.elsct_send(lport, NULL, fp, FC_NS_RFT_ID,
if (!lport->tt.elsct_send(lport, FC_FID_DIR_SERV, fp, FC_NS_RFT_ID,
fc_lport_rft_id_resp,
lport, lport->e_d_tov))
fc_lport_error(lport, fp);
Expand Down Expand Up @@ -1287,7 +1287,7 @@ static void fc_lport_enter_rpn_id(struct fc_lport *lport)
return;
}

if (!lport->tt.elsct_send(lport, NULL, fp, FC_NS_RPN_ID,
if (!lport->tt.elsct_send(lport, FC_FID_DIR_SERV, fp, FC_NS_RPN_ID,
fc_lport_rpn_id_resp,
lport, lport->e_d_tov))
fc_lport_error(lport, fp);
Expand Down Expand Up @@ -1443,8 +1443,8 @@ static void fc_lport_enter_logo(struct fc_lport *lport)
return;
}

if (!lport->tt.elsct_send(lport, NULL, fp, ELS_LOGO, fc_lport_logo_resp,
lport, lport->e_d_tov))
if (!lport->tt.elsct_send(lport, FC_FID_FLOGI, fp, ELS_LOGO,
fc_lport_logo_resp, lport, lport->e_d_tov))
fc_lport_error(lport, fp);
}

Expand Down Expand Up @@ -1567,7 +1567,7 @@ void fc_lport_enter_flogi(struct fc_lport *lport)
if (!fp)
return fc_lport_error(lport, fp);

if (!lport->tt.elsct_send(lport, NULL, fp, ELS_FLOGI,
if (!lport->tt.elsct_send(lport, FC_FID_FLOGI, fp, ELS_FLOGI,
fc_lport_flogi_resp, lport, lport->e_d_tov))
fc_lport_error(lport, fp);
}
Expand Down
8 changes: 4 additions & 4 deletions drivers/scsi/libfc/fc_rport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ static void fc_rport_enter_plogi(struct fc_rport_priv *rdata)
}
rdata->e_d_tov = lport->e_d_tov;

if (!lport->tt.elsct_send(lport, rdata, fp, ELS_PLOGI,
if (!lport->tt.elsct_send(lport, rport->port_id, fp, ELS_PLOGI,
fc_rport_plogi_resp, rdata, lport->e_d_tov))
fc_rport_error_retry(rdata, fp);
else
Expand Down Expand Up @@ -747,7 +747,7 @@ static void fc_rport_enter_prli(struct fc_rport_priv *rdata)
return;
}

if (!lport->tt.elsct_send(lport, rdata, fp, ELS_PRLI,
if (!lport->tt.elsct_send(lport, rport->port_id, fp, ELS_PRLI,
fc_rport_prli_resp, rdata, lport->e_d_tov))
fc_rport_error_retry(rdata, fp);
else
Expand Down Expand Up @@ -845,7 +845,7 @@ static void fc_rport_enter_rtv(struct fc_rport_priv *rdata)
return;
}

if (!lport->tt.elsct_send(lport, rdata, fp, ELS_RTV,
if (!lport->tt.elsct_send(lport, rport->port_id, fp, ELS_RTV,
fc_rport_rtv_resp, rdata, lport->e_d_tov))
fc_rport_error_retry(rdata, fp);
else
Expand Down Expand Up @@ -876,7 +876,7 @@ static void fc_rport_enter_logo(struct fc_rport_priv *rdata)
return;
}

if (!lport->tt.elsct_send(lport, rdata, fp, ELS_LOGO,
if (!lport->tt.elsct_send(lport, rport->port_id, fp, ELS_LOGO,
fc_rport_logo_resp, rdata, lport->e_d_tov))
fc_rport_error_retry(rdata, fp);
else
Expand Down
26 changes: 5 additions & 21 deletions include/scsi/fc_encode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@ static inline struct fc_ct_req *fc_ct_hdr_fill(const struct fc_frame *fp,
/**
* fc_ct_fill - Fill in a name service request frame
*/
static inline int fc_ct_fill(struct fc_lport *lport, struct fc_frame *fp,
unsigned int op, enum fc_rctl *r_ctl, u32 *did,
static inline int fc_ct_fill(struct fc_lport *lport,
struct fc_frame *fp,
unsigned int op, enum fc_rctl *r_ctl,
enum fc_fh_type *fh_type)
{
struct fc_ct_req *ct;
Expand Down Expand Up @@ -110,7 +111,6 @@ static inline int fc_ct_fill(struct fc_lport *lport, struct fc_frame *fp,
return -EINVAL;
}
*r_ctl = FC_RCTL_DD_UNSOL_CTL;
*did = FC_FID_DIR_SERV;
*fh_type = FC_TYPE_CT;
return 0;
}
Expand Down Expand Up @@ -250,53 +250,37 @@ static inline void fc_scr_fill(struct fc_lport *lport, struct fc_frame *fp)
* fc_els_fill - Fill in an ELS request frame
*/
static inline int fc_els_fill(struct fc_lport *lport,
struct fc_rport_priv *rdata,
u32 did,
struct fc_frame *fp, unsigned int op,
enum fc_rctl *r_ctl, u32 *did, enum fc_fh_type *fh_type)
enum fc_rctl *r_ctl, enum fc_fh_type *fh_type)
{
struct fc_rport *rport = PRIV_TO_RPORT(rdata);

switch (op) {
case ELS_PLOGI:
fc_plogi_fill(lport, fp, ELS_PLOGI);
*did = rport->port_id;
break;

case ELS_FLOGI:
fc_flogi_fill(lport, fp);
*did = FC_FID_FLOGI;
break;

case ELS_LOGO:
fc_logo_fill(lport, fp);
*did = FC_FID_FLOGI;
/*
* if rport is valid then it
* is port logo, therefore
* set did to rport id.
*/
if (rdata)
*did = rport->port_id;
break;

case ELS_RTV:
fc_rtv_fill(lport, fp);
*did = rport->port_id;
break;

case ELS_REC:
fc_rec_fill(lport, fp);
*did = rport->port_id;
break;

case ELS_PRLI:
fc_prli_fill(lport, fp);
*did = rport->port_id;
break;

case ELS_SCR:
fc_scr_fill(lport, fp);
*did = FC_FID_FCTRL;
break;

default:
Expand Down
2 changes: 1 addition & 1 deletion include/scsi/libfc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ struct libfc_function_template {
* STATUS: OPTIONAL
*/
struct fc_seq *(*elsct_send)(struct fc_lport *lport,
struct fc_rport_priv *,
u32 did,
struct fc_frame *fp,
unsigned int op,
void (*resp)(struct fc_seq *,
Expand Down

0 comments on commit a46f327

Please sign in to comment.