mirror of https://gitee.com/openkylin/linux.git
[SCSI] libfc: Move non-common routines and prototypes out of libfc.h
This patch moves all non-common routines and function prototypes out of libfc.h and into the appropriate .c files. It makes these routines 'static' when necessary and removes any unnecessary EXPORT_SYMBOL statements. A result of moving the fc_exch_seq_send, fc_seq_els_rsp_send, fc_exch_alloc and fc_seq_start_next prototypes out of libfc.h is that they were no longer being imported into fc_exch.c when libfc.h was included. This caused errors where routines in fc_exch.c were looking for undefined symbols. To fix this this patch reorganizes fc_seq_alloc, fc_seq_start_next and fc_seq_start_next_locked. This move also made it so that fc_seq_start_next_locked did not need to be prototyped at the top of fc_exch.c. Signed-off-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Robert Love
James Bottomley
parent
2171c225f6
commit
1a7b75ae71
|
|
@ -107,7 +107,6 @@ static void fc_seq_ls_rjt(struct fc_seq *, enum fc_els_rjt_reason,
|
|||
enum fc_els_rjt_explan);
|
||||
static void fc_exch_els_rec(struct fc_seq *, struct fc_frame *);
|
||||
static void fc_exch_els_rrq(struct fc_seq *, struct fc_frame *);
|
||||
static struct fc_seq *fc_seq_start_next_locked(struct fc_seq *sp);
|
||||
|
||||
/*
|
||||
* Internal implementation notes.
|
||||
|
|
@ -272,7 +271,6 @@ static void fc_exch_setup_hdr(struct fc_exch *ep, struct fc_frame *fp,
|
|||
fh->fh_seq_cnt = htons(ep->seq.cnt);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Release a reference to an exchange.
|
||||
* If the refcnt goes to zero and the exchange is complete, it is freed.
|
||||
|
|
@ -372,7 +370,104 @@ static void fc_exch_timer_set(struct fc_exch *ep, unsigned int timer_msec)
|
|||
spin_unlock_bh(&ep->ex_lock);
|
||||
}
|
||||
|
||||
int fc_seq_exch_abort(const struct fc_seq *req_sp, unsigned int timer_msec)
|
||||
/**
|
||||
* send a frame using existing sequence and exchange.
|
||||
*/
|
||||
static int fc_seq_send(struct fc_lport *lp, struct fc_seq *sp,
|
||||
struct fc_frame *fp)
|
||||
{
|
||||
struct fc_exch *ep;
|
||||
struct fc_frame_header *fh = fc_frame_header_get(fp);
|
||||
int error;
|
||||
u32 f_ctl;
|
||||
|
||||
ep = fc_seq_exch(sp);
|
||||
WARN_ON((ep->esb_stat & ESB_ST_SEQ_INIT) != ESB_ST_SEQ_INIT);
|
||||
|
||||
f_ctl = ntoh24(fh->fh_f_ctl);
|
||||
fc_exch_setup_hdr(ep, fp, f_ctl);
|
||||
|
||||
/*
|
||||
* update sequence count if this frame is carrying
|
||||
* multiple FC frames when sequence offload is enabled
|
||||
* by LLD.
|
||||
*/
|
||||
if (fr_max_payload(fp))
|
||||
sp->cnt += DIV_ROUND_UP((fr_len(fp) - sizeof(*fh)),
|
||||
fr_max_payload(fp));
|
||||
else
|
||||
sp->cnt++;
|
||||
|
||||
/*
|
||||
* Send the frame.
|
||||
*/
|
||||
error = lp->tt.frame_send(lp, fp);
|
||||
|
||||
/*
|
||||
* Update the exchange and sequence flags,
|
||||
* assuming all frames for the sequence have been sent.
|
||||
* We can only be called to send once for each sequence.
|
||||
*/
|
||||
spin_lock_bh(&ep->ex_lock);
|
||||
ep->f_ctl = f_ctl & ~FC_FC_FIRST_SEQ; /* not first seq */
|
||||
if (f_ctl & (FC_FC_END_SEQ | FC_FC_SEQ_INIT))
|
||||
ep->esb_stat &= ~ESB_ST_SEQ_INIT;
|
||||
spin_unlock_bh(&ep->ex_lock);
|
||||
return error;
|
||||
}
|
||||
|
||||
/**
|
||||
* fc_seq_alloc() - Allocate a sequence.
|
||||
* @ep: Exchange pointer
|
||||
* @seq_id: Sequence ID to allocate a sequence for
|
||||
*
|
||||
* We don't support multiple originated sequences on the same exchange.
|
||||
* By implication, any previously originated sequence on this exchange
|
||||
* is complete, and we reallocate the same sequence.
|
||||
*/
|
||||
static struct fc_seq *fc_seq_alloc(struct fc_exch *ep, u8 seq_id)
|
||||
{
|
||||
struct fc_seq *sp;
|
||||
|
||||
sp = &ep->seq;
|
||||
sp->ssb_stat = 0;
|
||||
sp->cnt = 0;
|
||||
sp->id = seq_id;
|
||||
return sp;
|
||||
}
|
||||
|
||||
static struct fc_seq *fc_seq_start_next_locked(struct fc_seq *sp)
|
||||
{
|
||||
struct fc_exch *ep = fc_seq_exch(sp);
|
||||
|
||||
sp = fc_seq_alloc(ep, ep->seq_id++);
|
||||
FC_EXCH_DBG(ep, "f_ctl %6x seq %2x\n",
|
||||
ep->f_ctl, sp->id);
|
||||
return sp;
|
||||
}
|
||||
|
||||
/**
|
||||
* Allocate a new sequence on the same exchange as the supplied sequence.
|
||||
* This will never return NULL.
|
||||
*/
|
||||
static struct fc_seq *fc_seq_start_next(struct fc_seq *sp)
|
||||
{
|
||||
struct fc_exch *ep = fc_seq_exch(sp);
|
||||
|
||||
spin_lock_bh(&ep->ex_lock);
|
||||
sp = fc_seq_start_next_locked(sp);
|
||||
spin_unlock_bh(&ep->ex_lock);
|
||||
|
||||
return sp;
|
||||
}
|
||||
|
||||
/**
|
||||
* This function is for seq_exch_abort function pointer in
|
||||
* struct libfc_function_template, see comment block on
|
||||
* seq_exch_abort for description of this function.
|
||||
*/
|
||||
static int fc_seq_exch_abort(const struct fc_seq *req_sp,
|
||||
unsigned int timer_msec)
|
||||
{
|
||||
struct fc_seq *sp;
|
||||
struct fc_exch *ep;
|
||||
|
|
@ -472,24 +567,6 @@ static void fc_exch_timeout(struct work_struct *work)
|
|||
fc_exch_release(ep);
|
||||
}
|
||||
|
||||
/*
|
||||
* Allocate a sequence.
|
||||
*
|
||||
* We don't support multiple originated sequences on the same exchange.
|
||||
* By implication, any previously originated sequence on this exchange
|
||||
* is complete, and we reallocate the same sequence.
|
||||
*/
|
||||
static struct fc_seq *fc_seq_alloc(struct fc_exch *ep, u8 seq_id)
|
||||
{
|
||||
struct fc_seq *sp;
|
||||
|
||||
sp = &ep->seq;
|
||||
sp->ssb_stat = 0;
|
||||
sp->cnt = 0;
|
||||
sp->id = seq_id;
|
||||
return sp;
|
||||
}
|
||||
|
||||
/**
|
||||
* fc_exch_em_alloc() - allocate an exchange from a specified EM.
|
||||
* @lport: ptr to the local port
|
||||
|
|
@ -570,7 +647,8 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
|
|||
* EM is selected having either a NULL match function pointer
|
||||
* or call to match function returning true.
|
||||
*/
|
||||
struct fc_exch *fc_exch_alloc(struct fc_lport *lport, struct fc_frame *fp)
|
||||
static struct fc_exch *fc_exch_alloc(struct fc_lport *lport,
|
||||
struct fc_frame *fp)
|
||||
{
|
||||
struct fc_exch_mgr_anchor *ema;
|
||||
struct fc_exch *ep;
|
||||
|
|
@ -584,7 +662,6 @@ struct fc_exch *fc_exch_alloc(struct fc_lport *lport, struct fc_frame *fp)
|
|||
}
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(fc_exch_alloc);
|
||||
|
||||
/*
|
||||
* Lookup and hold an exchange.
|
||||
|
|
@ -607,7 +684,13 @@ static struct fc_exch *fc_exch_find(struct fc_exch_mgr *mp, u16 xid)
|
|||
return ep;
|
||||
}
|
||||
|
||||
void fc_exch_done(struct fc_seq *sp)
|
||||
|
||||
/**
|
||||
* fc_exch_done() - Indicate that an exchange/sequence tuple is complete and
|
||||
* the memory allocated for the related objects may be freed.
|
||||
* @sp: Sequence pointer
|
||||
*/
|
||||
static void fc_exch_done(struct fc_seq *sp)
|
||||
{
|
||||
struct fc_exch *ep = fc_seq_exch(sp);
|
||||
int rc;
|
||||
|
|
@ -618,7 +701,6 @@ void fc_exch_done(struct fc_seq *sp)
|
|||
if (!rc)
|
||||
fc_exch_delete(ep);
|
||||
}
|
||||
EXPORT_SYMBOL(fc_exch_done);
|
||||
|
||||
/*
|
||||
* Allocate a new exchange as responder.
|
||||
|
|
@ -821,76 +903,15 @@ static void fc_exch_set_addr(struct fc_exch *ep,
|
|||
}
|
||||
}
|
||||
|
||||
static struct fc_seq *fc_seq_start_next_locked(struct fc_seq *sp)
|
||||
{
|
||||
struct fc_exch *ep = fc_seq_exch(sp);
|
||||
|
||||
sp = fc_seq_alloc(ep, ep->seq_id++);
|
||||
FC_EXCH_DBG(ep, "f_ctl %6x seq %2x\n",
|
||||
ep->f_ctl, sp->id);
|
||||
return sp;
|
||||
}
|
||||
/*
|
||||
* Allocate a new sequence on the same exchange as the supplied sequence.
|
||||
* This will never return NULL.
|
||||
/**
|
||||
* fc_seq_els_rsp_send() - Send ELS response using mainly infomation
|
||||
* in exchange and sequence in EM layer.
|
||||
* @sp: Sequence pointer
|
||||
* @els_cmd: ELS command
|
||||
* @els_data: ELS data
|
||||
*/
|
||||
struct fc_seq *fc_seq_start_next(struct fc_seq *sp)
|
||||
{
|
||||
struct fc_exch *ep = fc_seq_exch(sp);
|
||||
|
||||
spin_lock_bh(&ep->ex_lock);
|
||||
sp = fc_seq_start_next_locked(sp);
|
||||
spin_unlock_bh(&ep->ex_lock);
|
||||
|
||||
return sp;
|
||||
}
|
||||
EXPORT_SYMBOL(fc_seq_start_next);
|
||||
|
||||
int fc_seq_send(struct fc_lport *lp, struct fc_seq *sp, struct fc_frame *fp)
|
||||
{
|
||||
struct fc_exch *ep;
|
||||
struct fc_frame_header *fh = fc_frame_header_get(fp);
|
||||
int error;
|
||||
u32 f_ctl;
|
||||
|
||||
ep = fc_seq_exch(sp);
|
||||
WARN_ON((ep->esb_stat & ESB_ST_SEQ_INIT) != ESB_ST_SEQ_INIT);
|
||||
|
||||
f_ctl = ntoh24(fh->fh_f_ctl);
|
||||
fc_exch_setup_hdr(ep, fp, f_ctl);
|
||||
|
||||
/*
|
||||
* update sequence count if this frame is carrying
|
||||
* multiple FC frames when sequence offload is enabled
|
||||
* by LLD.
|
||||
*/
|
||||
if (fr_max_payload(fp))
|
||||
sp->cnt += DIV_ROUND_UP((fr_len(fp) - sizeof(*fh)),
|
||||
fr_max_payload(fp));
|
||||
else
|
||||
sp->cnt++;
|
||||
|
||||
/*
|
||||
* Send the frame.
|
||||
*/
|
||||
error = lp->tt.frame_send(lp, fp);
|
||||
|
||||
/*
|
||||
* Update the exchange and sequence flags,
|
||||
* assuming all frames for the sequence have been sent.
|
||||
* We can only be called to send once for each sequence.
|
||||
*/
|
||||
spin_lock_bh(&ep->ex_lock);
|
||||
ep->f_ctl = f_ctl & ~FC_FC_FIRST_SEQ; /* not first seq */
|
||||
if (f_ctl & (FC_FC_END_SEQ | FC_FC_SEQ_INIT))
|
||||
ep->esb_stat &= ~ESB_ST_SEQ_INIT;
|
||||
spin_unlock_bh(&ep->ex_lock);
|
||||
return error;
|
||||
}
|
||||
EXPORT_SYMBOL(fc_seq_send);
|
||||
|
||||
void fc_seq_els_rsp_send(struct fc_seq *sp, enum fc_els_cmd els_cmd,
|
||||
struct fc_seq_els_data *els_data)
|
||||
static void fc_seq_els_rsp_send(struct fc_seq *sp, enum fc_els_cmd els_cmd,
|
||||
struct fc_seq_els_data *els_data)
|
||||
{
|
||||
switch (els_cmd) {
|
||||
case ELS_LS_RJT:
|
||||
|
|
@ -909,7 +930,6 @@ void fc_seq_els_rsp_send(struct fc_seq *sp, enum fc_els_cmd els_cmd,
|
|||
FC_EXCH_DBG(fc_seq_exch(sp), "Invalid ELS CMD:%x\n", els_cmd);
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(fc_seq_els_rsp_send);
|
||||
|
||||
/*
|
||||
* Send a sequence, which is also the last sequence in the exchange.
|
||||
|
|
@ -1662,6 +1682,68 @@ static void fc_exch_rrq_resp(struct fc_seq *sp, struct fc_frame *fp, void *arg)
|
|||
fc_exch_release(aborted_ep);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* This function is for exch_seq_send function pointer in
|
||||
* struct libfc_function_template, see comment block on
|
||||
* exch_seq_send for description of this function.
|
||||
*/
|
||||
static struct fc_seq *fc_exch_seq_send(struct fc_lport *lp,
|
||||
struct fc_frame *fp,
|
||||
void (*resp)(struct fc_seq *,
|
||||
struct fc_frame *fp,
|
||||
void *arg),
|
||||
void (*destructor)(struct fc_seq *,
|
||||
void *),
|
||||
void *arg, u32 timer_msec)
|
||||
{
|
||||
struct fc_exch *ep;
|
||||
struct fc_seq *sp = NULL;
|
||||
struct fc_frame_header *fh;
|
||||
int rc = 1;
|
||||
|
||||
ep = fc_exch_alloc(lp, fp);
|
||||
if (!ep) {
|
||||
fc_frame_free(fp);
|
||||
return NULL;
|
||||
}
|
||||
ep->esb_stat |= ESB_ST_SEQ_INIT;
|
||||
fh = fc_frame_header_get(fp);
|
||||
fc_exch_set_addr(ep, ntoh24(fh->fh_s_id), ntoh24(fh->fh_d_id));
|
||||
ep->resp = resp;
|
||||
ep->destructor = destructor;
|
||||
ep->arg = arg;
|
||||
ep->r_a_tov = FC_DEF_R_A_TOV;
|
||||
ep->lp = lp;
|
||||
sp = &ep->seq;
|
||||
|
||||
ep->fh_type = fh->fh_type; /* save for possbile timeout handling */
|
||||
ep->f_ctl = ntoh24(fh->fh_f_ctl);
|
||||
fc_exch_setup_hdr(ep, fp, ep->f_ctl);
|
||||
sp->cnt++;
|
||||
|
||||
if (ep->xid <= lp->lro_xid)
|
||||
fc_fcp_ddp_setup(fr_fsp(fp), ep->xid);
|
||||
|
||||
if (unlikely(lp->tt.frame_send(lp, fp)))
|
||||
goto err;
|
||||
|
||||
if (timer_msec)
|
||||
fc_exch_timer_set_locked(ep, timer_msec);
|
||||
ep->f_ctl &= ~FC_FC_FIRST_SEQ; /* not first seq */
|
||||
|
||||
if (ep->f_ctl & FC_FC_SEQ_INIT)
|
||||
ep->esb_stat &= ~ESB_ST_SEQ_INIT;
|
||||
spin_unlock_bh(&ep->ex_lock);
|
||||
return sp;
|
||||
err:
|
||||
rc = fc_exch_done_locked(ep);
|
||||
spin_unlock_bh(&ep->ex_lock);
|
||||
if (!rc)
|
||||
fc_exch_delete(ep);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Send ELS RRQ - Reinstate Recovery Qualifier.
|
||||
* This tells the remote port to stop blocking the use of
|
||||
|
|
@ -1902,63 +1984,6 @@ void fc_exch_mgr_free(struct fc_lport *lport)
|
|||
}
|
||||
EXPORT_SYMBOL(fc_exch_mgr_free);
|
||||
|
||||
|
||||
struct fc_seq *fc_exch_seq_send(struct fc_lport *lp,
|
||||
struct fc_frame *fp,
|
||||
void (*resp)(struct fc_seq *,
|
||||
struct fc_frame *fp,
|
||||
void *arg),
|
||||
void (*destructor)(struct fc_seq *, void *),
|
||||
void *arg, u32 timer_msec)
|
||||
{
|
||||
struct fc_exch *ep;
|
||||
struct fc_seq *sp = NULL;
|
||||
struct fc_frame_header *fh;
|
||||
int rc = 1;
|
||||
|
||||
ep = fc_exch_alloc(lp, fp);
|
||||
if (!ep) {
|
||||
fc_frame_free(fp);
|
||||
return NULL;
|
||||
}
|
||||
ep->esb_stat |= ESB_ST_SEQ_INIT;
|
||||
fh = fc_frame_header_get(fp);
|
||||
fc_exch_set_addr(ep, ntoh24(fh->fh_s_id), ntoh24(fh->fh_d_id));
|
||||
ep->resp = resp;
|
||||
ep->destructor = destructor;
|
||||
ep->arg = arg;
|
||||
ep->r_a_tov = FC_DEF_R_A_TOV;
|
||||
ep->lp = lp;
|
||||
sp = &ep->seq;
|
||||
|
||||
ep->fh_type = fh->fh_type; /* save for possbile timeout handling */
|
||||
ep->f_ctl = ntoh24(fh->fh_f_ctl);
|
||||
fc_exch_setup_hdr(ep, fp, ep->f_ctl);
|
||||
sp->cnt++;
|
||||
|
||||
if (ep->xid <= lp->lro_xid)
|
||||
fc_fcp_ddp_setup(fr_fsp(fp), ep->xid);
|
||||
|
||||
if (unlikely(lp->tt.frame_send(lp, fp)))
|
||||
goto err;
|
||||
|
||||
if (timer_msec)
|
||||
fc_exch_timer_set_locked(ep, timer_msec);
|
||||
ep->f_ctl &= ~FC_FC_FIRST_SEQ; /* not first seq */
|
||||
|
||||
if (ep->f_ctl & FC_FC_SEQ_INIT)
|
||||
ep->esb_stat &= ~ESB_ST_SEQ_INIT;
|
||||
spin_unlock_bh(&ep->ex_lock);
|
||||
return sp;
|
||||
err:
|
||||
rc = fc_exch_done_locked(ep);
|
||||
spin_unlock_bh(&ep->ex_lock);
|
||||
if (!rc)
|
||||
fc_exch_delete(ep);
|
||||
return NULL;
|
||||
}
|
||||
EXPORT_SYMBOL(fc_exch_seq_send);
|
||||
|
||||
/*
|
||||
* Receive a frame
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1011,55 +1011,6 @@ void fc_exch_mgr_free(struct fc_lport *lport);
|
|||
*/
|
||||
void fc_exch_recv(struct fc_lport *lp, struct fc_frame *fp);
|
||||
|
||||
/*
|
||||
* This function is for exch_seq_send function pointer in
|
||||
* struct libfc_function_template, see comment block on
|
||||
* exch_seq_send for description of this function.
|
||||
*/
|
||||
struct fc_seq *fc_exch_seq_send(struct fc_lport *lp,
|
||||
struct fc_frame *fp,
|
||||
void (*resp)(struct fc_seq *sp,
|
||||
struct fc_frame *fp,
|
||||
void *arg),
|
||||
void (*destructor)(struct fc_seq *sp,
|
||||
void *arg),
|
||||
void *arg, u32 timer_msec);
|
||||
|
||||
/*
|
||||
* send a frame using existing sequence and exchange.
|
||||
*/
|
||||
int fc_seq_send(struct fc_lport *lp, struct fc_seq *sp, struct fc_frame *fp);
|
||||
|
||||
/*
|
||||
* Send ELS response using mainly infomation
|
||||
* in exchange and sequence in EM layer.
|
||||
*/
|
||||
void fc_seq_els_rsp_send(struct fc_seq *sp, enum fc_els_cmd els_cmd,
|
||||
struct fc_seq_els_data *els_data);
|
||||
|
||||
/*
|
||||
* This function is for seq_exch_abort function pointer in
|
||||
* struct libfc_function_template, see comment block on
|
||||
* seq_exch_abort for description of this function.
|
||||
*/
|
||||
int fc_seq_exch_abort(const struct fc_seq *req_sp, unsigned int timer_msec);
|
||||
|
||||
/*
|
||||
* Indicate that an exchange/sequence tuple is complete and the memory
|
||||
* allocated for the related objects may be freed.
|
||||
*/
|
||||
void fc_exch_done(struct fc_seq *sp);
|
||||
|
||||
/*
|
||||
* Allocate a new exchange and sequence pair.
|
||||
*/
|
||||
struct fc_exch *fc_exch_alloc(struct fc_lport *lport, struct fc_frame *fp);
|
||||
/*
|
||||
* Start a new sequence on the same exchange as the supplied sequence.
|
||||
*/
|
||||
struct fc_seq *fc_seq_start_next(struct fc_seq *sp);
|
||||
|
||||
|
||||
/*
|
||||
* Reset all EMs of a lport, releasing its all sequences and
|
||||
* exchanges. If sid is non-zero, then reset only exchanges
|
||||
|
|
|
|||
Loading…
Reference in New Issue