Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 161135
b: refs/heads/master
c: ab28f1f
h: refs/heads/master
i:
  161133: f255bcc
  161131: c25d3d9
  161127: f1c1975
  161119: 4260071
v: v3
  • Loading branch information
Joe Eykholt authored and James Bottomley committed Sep 10, 2009
1 parent 056e51f commit 22ef6ca
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 090eb6c41aa74273d3f0721637cff738cfd80669
refs/heads/master: ab28f1fd3b0d14c1bd693e640decd711d5e6642a
18 changes: 9 additions & 9 deletions trunk/drivers/scsi/libfc/fc_disc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct fc_rport *fc_disc_lookup_rport(const struct fc_lport *lport,
{
const struct fc_disc *disc = &lport->disc;
struct fc_rport *rport, *found = NULL;
struct fc_rport_libfc_priv *rdata;
struct fc_rport_priv *rdata;
int disc_found = 0;

list_for_each_entry(rdata, &disc->rports, peers) {
Expand Down Expand Up @@ -94,7 +94,7 @@ void fc_disc_stop_rports(struct fc_disc *disc)
{
struct fc_lport *lport;
struct fc_rport *rport;
struct fc_rport_libfc_priv *rdata, *next;
struct fc_rport_priv *rdata, *next;

lport = disc->lport;

Expand Down Expand Up @@ -126,7 +126,7 @@ static void fc_disc_rport_callback(struct fc_lport *lport,
struct fc_rport *rport,
enum fc_rport_event event)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_disc *disc = &lport->disc;

FC_DISC_DBG(disc, "Received a %d event for port (%6x)\n", event,
Expand Down Expand Up @@ -170,7 +170,7 @@ static void fc_disc_recv_rscn_req(struct fc_seq *sp, struct fc_frame *fp,
{
struct fc_lport *lport;
struct fc_rport *rport;
struct fc_rport_libfc_priv *rdata;
struct fc_rport_priv *rdata;
struct fc_els_rscn *rp;
struct fc_els_rscn_page *pp;
struct fc_seq_els_data rjt_data;
Expand Down Expand Up @@ -309,7 +309,7 @@ static void fc_disc_recv_req(struct fc_seq *sp, struct fc_frame *fp,
static void fc_disc_restart(struct fc_disc *disc)
{
struct fc_rport *rport;
struct fc_rport_libfc_priv *rdata, *next;
struct fc_rport_priv *rdata, *next;
struct fc_lport *lport = disc->lport;

FC_DISC_DBG(disc, "Restarting discovery\n");
Expand Down Expand Up @@ -400,7 +400,7 @@ static int fc_disc_new_target(struct fc_disc *disc,
struct fc_rport_identifiers *ids)
{
struct fc_lport *lport = disc->lport;
struct fc_rport_libfc_priv *rdata;
struct fc_rport_priv *rdata;
int error = 0;

if (rport && ids->port_name) {
Expand Down Expand Up @@ -458,7 +458,7 @@ static int fc_disc_new_target(struct fc_disc *disc,
static void fc_disc_del_target(struct fc_disc *disc, struct fc_rport *rport)
{
struct fc_lport *lport = disc->lport;
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
list_del(&rdata->peers);
lport->tt.rport_logoff(rport);
}
Expand Down Expand Up @@ -580,7 +580,7 @@ static int fc_disc_gpn_ft_parse(struct fc_disc *disc, void *buf, size_t len)
int error = 0;
struct fc_disc_port dp;
struct fc_rport *rport;
struct fc_rport_libfc_priv *rdata;
struct fc_rport_priv *rdata;

lport = disc->lport;

Expand Down Expand Up @@ -774,7 +774,7 @@ static void fc_disc_single(struct fc_disc *disc, struct fc_disc_port *dp)
{
struct fc_lport *lport;
struct fc_rport *new_rport;
struct fc_rport_libfc_priv *rdata;
struct fc_rport_priv *rdata;

lport = disc->lport;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/scsi/libfc/fc_lport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1306,7 +1306,7 @@ static struct fc_rport_operations fc_lport_rport_ops = {
static void fc_lport_enter_dns(struct fc_lport *lport)
{
struct fc_rport *rport;
struct fc_rport_libfc_priv *rdata;
struct fc_rport_priv *rdata;
struct fc_disc_port dp;

dp.ids.port_id = FC_FID_DIR_SERV;
Expand Down
60 changes: 30 additions & 30 deletions trunk/drivers/scsi/libfc/fc_rport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static void fc_rport_rogue_destroy(struct device *dev)
struct fc_rport *fc_rport_rogue_create(struct fc_disc_port *dp)
{
struct fc_rport *rport;
struct fc_rport_libfc_priv *rdata;
struct fc_rport_priv *rdata;
rport = kzalloc(sizeof(*rport) + sizeof(*rdata), GFP_KERNEL);

if (!rport)
Expand Down Expand Up @@ -144,7 +144,7 @@ struct fc_rport *fc_rport_rogue_create(struct fc_disc_port *dp)
static const char *fc_rport_state(struct fc_rport *rport)
{
const char *cp;
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;

cp = fc_rport_state_names[rdata->rp_state];
if (!cp)
Expand Down Expand Up @@ -199,7 +199,7 @@ static unsigned int fc_plogi_get_maxframe(struct fc_els_flogi *flp,
static void fc_rport_state_enter(struct fc_rport *rport,
enum fc_rport_state new)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
if (rdata->rp_state != new)
rdata->retries = 0;
rdata->rp_state = new;
Expand All @@ -208,8 +208,8 @@ static void fc_rport_state_enter(struct fc_rport *rport,
static void fc_rport_work(struct work_struct *work)
{
u32 port_id;
struct fc_rport_libfc_priv *rdata =
container_of(work, struct fc_rport_libfc_priv, event_work);
struct fc_rport_priv *rdata =
container_of(work, struct fc_rport_priv, event_work);
enum fc_rport_event event;
enum fc_rport_trans_state trans_state;
struct fc_lport *lport = rdata->local_port;
Expand All @@ -222,7 +222,7 @@ static void fc_rport_work(struct work_struct *work)

if (event == RPORT_EV_CREATED) {
struct fc_rport *new_rport;
struct fc_rport_libfc_priv *new_rdata;
struct fc_rport_priv *new_rdata;
struct fc_rport_identifiers ids;

ids.port_id = rport->port_id;
Expand Down Expand Up @@ -299,7 +299,7 @@ static void fc_rport_work(struct work_struct *work)
*/
int fc_rport_login(struct fc_rport *rport)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;

mutex_lock(&rdata->rp_mutex);

Expand Down Expand Up @@ -329,7 +329,7 @@ int fc_rport_login(struct fc_rport *rport)
static void fc_rport_enter_delete(struct fc_rport *rport,
enum fc_rport_event event)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;

if (rdata->rp_state == RPORT_ST_DELETE)
return;
Expand All @@ -353,7 +353,7 @@ static void fc_rport_enter_delete(struct fc_rport *rport,
*/
int fc_rport_logoff(struct fc_rport *rport)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;

mutex_lock(&rdata->rp_mutex);

Expand Down Expand Up @@ -387,7 +387,7 @@ int fc_rport_logoff(struct fc_rport *rport)
*/
static void fc_rport_enter_ready(struct fc_rport *rport)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;

fc_rport_state_enter(rport, RPORT_ST_READY);

Expand All @@ -400,16 +400,16 @@ static void fc_rport_enter_ready(struct fc_rport *rport)

/**
* fc_rport_timeout() - Handler for the retry_work timer.
* @work: The work struct of the fc_rport_libfc_priv
* @work: The work struct of the fc_rport_priv
*
* Locking Note: Called without the rport lock held. This
* function will hold the rport lock, call an _enter_*
* function and then unlock the rport.
*/
static void fc_rport_timeout(struct work_struct *work)
{
struct fc_rport_libfc_priv *rdata =
container_of(work, struct fc_rport_libfc_priv, retry_work.work);
struct fc_rport_priv *rdata =
container_of(work, struct fc_rport_priv, retry_work.work);
struct fc_rport *rport = PRIV_TO_RPORT(rdata);

mutex_lock(&rdata->rp_mutex);
Expand Down Expand Up @@ -446,7 +446,7 @@ static void fc_rport_timeout(struct work_struct *work)
*/
static void fc_rport_error(struct fc_rport *rport, struct fc_frame *fp)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;

FC_RPORT_DBG(rport, "Error %ld in state %s, retries %d\n",
PTR_ERR(fp), fc_rport_state(rport), rdata->retries);
Expand Down Expand Up @@ -480,7 +480,7 @@ static void fc_rport_error(struct fc_rport *rport, struct fc_frame *fp)
*/
static void fc_rport_error_retry(struct fc_rport *rport, struct fc_frame *fp)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
unsigned long delay = FC_DEF_E_D_TOV;

/* make sure this isn't an FC_EX_CLOSED error, never retry those */
Expand Down Expand Up @@ -515,7 +515,7 @@ static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp,
void *rp_arg)
{
struct fc_rport *rport = rp_arg;
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;
struct fc_els_flogi *plp = NULL;
unsigned int tov;
Expand Down Expand Up @@ -586,7 +586,7 @@ static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp,
*/
static void fc_rport_enter_plogi(struct fc_rport *rport)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;
struct fc_frame *fp;

Expand Down Expand Up @@ -624,7 +624,7 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp,
void *rp_arg)
{
struct fc_rport *rport = rp_arg;
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct {
struct fc_els_prli prli;
struct fc_els_spp spp;
Expand Down Expand Up @@ -694,7 +694,7 @@ static void fc_rport_logo_resp(struct fc_seq *sp, struct fc_frame *fp,
void *rp_arg)
{
struct fc_rport *rport = rp_arg;
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
u8 op;

mutex_lock(&rdata->rp_mutex);
Expand Down Expand Up @@ -738,7 +738,7 @@ static void fc_rport_logo_resp(struct fc_seq *sp, struct fc_frame *fp,
*/
static void fc_rport_enter_prli(struct fc_rport *rport)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;
struct {
struct fc_els_prli prli;
Expand Down Expand Up @@ -780,7 +780,7 @@ static void fc_rport_rtv_resp(struct fc_seq *sp, struct fc_frame *fp,
void *rp_arg)
{
struct fc_rport *rport = rp_arg;
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
u8 op;

mutex_lock(&rdata->rp_mutex);
Expand Down Expand Up @@ -841,7 +841,7 @@ static void fc_rport_rtv_resp(struct fc_seq *sp, struct fc_frame *fp,
static void fc_rport_enter_rtv(struct fc_rport *rport)
{
struct fc_frame *fp;
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;

FC_RPORT_DBG(rport, "Port entered RTV state from %s state\n",
Expand Down Expand Up @@ -871,7 +871,7 @@ static void fc_rport_enter_rtv(struct fc_rport *rport)
*/
static void fc_rport_enter_logo(struct fc_rport *rport)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;
struct fc_frame *fp;

Expand Down Expand Up @@ -907,7 +907,7 @@ static void fc_rport_enter_logo(struct fc_rport *rport)
void fc_rport_recv_req(struct fc_seq *sp, struct fc_frame *fp,
struct fc_rport *rport)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;

struct fc_frame_header *fh;
Expand Down Expand Up @@ -967,7 +967,7 @@ void fc_rport_recv_req(struct fc_seq *sp, struct fc_frame *fp,
static void fc_rport_recv_plogi_req(struct fc_rport *rport,
struct fc_seq *sp, struct fc_frame *rx_fp)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;
struct fc_frame *fp = rx_fp;
struct fc_exch *ep;
Expand Down Expand Up @@ -1090,7 +1090,7 @@ static void fc_rport_recv_plogi_req(struct fc_rport *rport,
static void fc_rport_recv_prli_req(struct fc_rport *rport,
struct fc_seq *sp, struct fc_frame *rx_fp)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;
struct fc_exch *ep;
struct fc_frame *fp;
Expand Down Expand Up @@ -1242,7 +1242,7 @@ static void fc_rport_recv_prli_req(struct fc_rport *rport,
static void fc_rport_recv_prlo_req(struct fc_rport *rport, struct fc_seq *sp,
struct fc_frame *fp)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;

struct fc_frame_header *fh;
Expand Down Expand Up @@ -1278,7 +1278,7 @@ static void fc_rport_recv_logo_req(struct fc_rport *rport, struct fc_seq *sp,
struct fc_frame *fp)
{
struct fc_frame_header *fh;
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;

fh = fc_frame_header_get(fp);
Expand Down Expand Up @@ -1342,8 +1342,8 @@ EXPORT_SYMBOL(fc_destroy_rport);

void fc_rport_terminate_io(struct fc_rport *rport)
{
struct fc_rport_libfc_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port;
struct fc_rport_libfc_priv *rp = rport->dd_data;
struct fc_lport *lport = rp->local_port;

lport->tt.exch_mgr_reset(lport, 0, rport->port_id);
lport->tt.exch_mgr_reset(lport, rport->port_id, 0);
Expand Down
10 changes: 9 additions & 1 deletion trunk/include/scsi/libfc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ do { \

#define FC_RPORT_DBG(rport, fmt, args...) \
do { \
struct fc_rport_libfc_priv *rdata = rport->dd_data; \
struct fc_rport_priv *rdata = rport->dd_data; \
struct fc_lport *lport = rdata->local_port; \
FC_RPORT_ID_DBG(lport, rport->port_id, fmt, ##args); \
} while (0)
Expand Down Expand Up @@ -177,6 +177,14 @@ enum fc_rport_event {
RPORT_EV_LOGO
};

/*
* Temporary definition to prepare for split off from fc_rport_libfc_priv
* of a separately-allocated structure called fc_rport_priv. This will
* be the primary object for the discovery and rport state machines.
* This definition is just to make this patch series easier to review.
*/
#define fc_rport_priv fc_rport_libfc_priv

struct fc_rport_operations {
void (*event_callback)(struct fc_lport *, struct fc_rport *,
enum fc_rport_event);
Expand Down

0 comments on commit 22ef6ca

Please sign in to comment.