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

Commit 1bd49b48 authored by Vasu Dev's avatar Vasu Dev Committed by James Bottomley
Browse files

[SCSI] libfc, fcoe, bnx2fc: cleanup fcoe_dev_stats 



The libfc is used by fcoe but fcoe agnostic,
and therefore should not have any fcoe references.

So renaming fcoe_dev_stats from libfc as its for fc_stats.
After that libfc is fcoe string free except some strings for
Open-FCoE.org.

Signed-off-by: default avatarVasu Dev <vasu.dev@intel.com>
Acked-by : Robert Love <robert.w.love@intel.com>
Tested-by: default avatarRoss Brattain <ross.b.brattain@intel.com>
Acked-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent e58abb0c

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

+5 −5
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int bnx2fc_xmit(struct fc_lport *lport, struct fc_frame *fp) 
	struct fcoe_port	*port;

	struct fcoe_hdr		*hp;

	struct bnx2fc_rport	*tgt;

	struct fcoe_dev_stats	*stats;

	struct fc_stats		*stats;

	u8			sof, eof;

	u32			crc;

	unsigned int		hlen, tlen, elen;
@@ -412,7 +412,7 @@ static int bnx2fc_xmit(struct fc_lport *lport, struct fc_frame *fp) 
	}



	/*update tx stats */

	stats = per_cpu_ptr(lport->dev_stats, get_cpu());

	stats = per_cpu_ptr(lport->stats, get_cpu());

	stats->TxFrames++;

	stats->TxWords += wlen;

	put_cpu();
@@ -522,7 +522,7 @@ static void bnx2fc_recv_frame(struct sk_buff *skb) 
	u32 fr_len;

	struct fc_lport *lport;

	struct fcoe_rcv_info *fr;

	struct fcoe_dev_stats *stats;

	struct fc_stats *stats;

	struct fc_frame_header *fh;

	struct fcoe_crc_eof crc_eof;

	struct fc_frame *fp;
@@ -551,7 +551,7 @@ static void bnx2fc_recv_frame(struct sk_buff *skb) 
	skb_pull(skb, sizeof(struct fcoe_hdr));

	fr_len = skb->len - sizeof(struct fcoe_crc_eof);



	stats = per_cpu_ptr(lport->dev_stats, get_cpu());

	stats = per_cpu_ptr(lport->stats, get_cpu());

	stats->RxFrames++;

	stats->RxWords += fr_len / FCOE_WORD_TO_BYTE;
@@ -942,7 +942,7 @@ static void bnx2fc_indicate_netevent(void *context, unsigned long event, 
							FC_PORTTYPE_UNKNOWN;

			mutex_unlock(&lport->lp_mutex);

			fc_host_port_type(lport->host) = FC_PORTTYPE_UNKNOWN;

			per_cpu_ptr(lport->dev_stats,

			per_cpu_ptr(lport->stats,

				    get_cpu())->LinkFailureCount++;

			put_cpu();

			fcoe_clean_pending_queue(lport);

drivers/scsi/bnx2fc/bnx2fc_io.c

+2 −2
Original line number Diff line number Diff line
@@ -1980,7 +1980,7 @@ int bnx2fc_post_io_req(struct bnx2fc_rport *tgt, 
	struct bnx2fc_interface *interface = port->priv;

	struct bnx2fc_hba *hba = interface->hba;

	struct fc_lport *lport = port->lport;

	struct fcoe_dev_stats *stats;

	struct fc_stats *stats;

	int task_idx, index;

	u16 xid;
@@ -1991,7 +1991,7 @@ int bnx2fc_post_io_req(struct bnx2fc_rport *tgt, 
	io_req->data_xfer_len = scsi_bufflen(sc_cmd);

	sc_cmd->SCp.ptr = (char *)io_req;



	stats = per_cpu_ptr(lport->dev_stats, get_cpu());

	stats = per_cpu_ptr(lport->stats, get_cpu());

	if (sc_cmd->sc_data_direction == DMA_FROM_DEVICE) {

		io_req->io_req_flags = BNX2FC_READ;

		stats->InputRequests++;

drivers/scsi/fcoe/fcoe.c

+9 −9
Original line number Diff line number Diff line
@@ -1529,7 +1529,7 @@ static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev, 


	return 0;

err:

	per_cpu_ptr(lport->dev_stats, get_cpu())->ErrorFrames++;

	per_cpu_ptr(lport->stats, get_cpu())->ErrorFrames++;

	put_cpu();

err2:

	kfree_skb(skb);
@@ -1569,7 +1569,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp) 
	struct ethhdr *eh;

	struct fcoe_crc_eof *cp;

	struct sk_buff *skb;

	struct fcoe_dev_stats *stats;

	struct fc_stats *stats;

	struct fc_frame_header *fh;

	unsigned int hlen;		/* header length implies the version */

	unsigned int tlen;		/* trailer length */
@@ -1680,7 +1680,7 @@ static int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp) 
		skb_shinfo(skb)->gso_size = 0;

	}

	/* update tx stats: regardless if LLD fails */

	stats = per_cpu_ptr(lport->dev_stats, get_cpu());

	stats = per_cpu_ptr(lport->stats, get_cpu());

	stats->TxFrames++;

	stats->TxWords += wlen;

	put_cpu();
@@ -1714,7 +1714,7 @@ static inline int fcoe_filter_frames(struct fc_lport *lport, 
	struct fcoe_interface *fcoe;

	struct fc_frame_header *fh;

	struct sk_buff *skb = (struct sk_buff *)fp;

	struct fcoe_dev_stats *stats;

	struct fc_stats *stats;



	/*

	 * We only check CRC if no offload is available and if it is
@@ -1745,7 +1745,7 @@ static inline int fcoe_filter_frames(struct fc_lport *lport, 
		return 0;

	}



	stats = per_cpu_ptr(lport->dev_stats, get_cpu());

	stats = per_cpu_ptr(lport->stats, get_cpu());

	stats->InvalidCRCCount++;

	if (stats->InvalidCRCCount < 5)

		printk(KERN_WARNING "fcoe: dropping frame with CRC error\n");
@@ -1762,7 +1762,7 @@ static void fcoe_recv_frame(struct sk_buff *skb) 
	u32 fr_len;

	struct fc_lport *lport;

	struct fcoe_rcv_info *fr;

	struct fcoe_dev_stats *stats;

	struct fc_stats *stats;

	struct fcoe_crc_eof crc_eof;

	struct fc_frame *fp;

	struct fcoe_port *port;
@@ -1793,7 +1793,7 @@ static void fcoe_recv_frame(struct sk_buff *skb) 
	 */

	hp = (struct fcoe_hdr *) skb_network_header(skb);



	stats = per_cpu_ptr(lport->dev_stats, get_cpu());

	stats = per_cpu_ptr(lport->stats, get_cpu());

	if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) {

		if (stats->ErrorFrames < 5)

			printk(KERN_WARNING "fcoe: FCoE version "
@@ -1970,7 +1970,7 @@ static int fcoe_device_notification(struct notifier_block *notifier, 
	struct fcoe_ctlr *ctlr;

	struct fcoe_interface *fcoe;

	struct fcoe_port *port;

	struct fcoe_dev_stats *stats;

	struct fc_stats *stats;

	u32 link_possible = 1;

	u32 mfs;

	int rc = NOTIFY_OK;
@@ -2024,7 +2024,7 @@ static int fcoe_device_notification(struct notifier_block *notifier, 
	if (link_possible && !fcoe_link_ok(lport))

		fcoe_ctlr_link_up(ctlr);

	else if (fcoe_ctlr_link_down(ctlr)) {

		stats = per_cpu_ptr(lport->dev_stats, get_cpu());

		stats = per_cpu_ptr(lport->stats, get_cpu());

		stats->LinkFailureCount++;

		put_cpu();

		fcoe_clean_pending_queue(lport);

drivers/scsi/fcoe/fcoe_ctlr.c

+6 −7
Original line number Diff line number Diff line
@@ -788,11 +788,11 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip) 
	unsigned long deadline;

	unsigned long sel_time = 0;

	struct list_head del_list;

	struct fcoe_dev_stats *stats;

	struct fc_stats *stats;



	INIT_LIST_HEAD(&del_list);



	stats = per_cpu_ptr(fip->lp->dev_stats, get_cpu());

	stats = per_cpu_ptr(fip->lp->stats, get_cpu());



	list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {

		deadline = fcf->time + fcf->fka_period + fcf->fka_period / 2;
@@ -1104,8 +1104,8 @@ static void fcoe_ctlr_recv_els(struct fcoe_ctlr *fip, struct sk_buff *skb) 
	struct fc_frame_header *fh = NULL;

	struct fip_desc *desc;

	struct fip_encaps *els;

	struct fcoe_dev_stats *stats;

	struct fcoe_fcf *sel;

	struct fc_stats *stats;

	enum fip_desc_type els_dtype = 0;

	u8 els_op;

	u8 sub;
@@ -1249,7 +1249,7 @@ static void fcoe_ctlr_recv_els(struct fcoe_ctlr *fip, struct sk_buff *skb) 
	fr_dev(fp) = lport;

	fr_encaps(fp) = els_dtype;



	stats = per_cpu_ptr(lport->dev_stats, get_cpu());

	stats = per_cpu_ptr(lport->stats, get_cpu());

	stats->RxFrames++;

	stats->RxWords += skb->len / FIP_BPW;

	put_cpu();
@@ -1353,7 +1353,7 @@ static void fcoe_ctlr_recv_clr_vlink(struct fcoe_ctlr *fip, 
						      ntoh24(vp->fd_fc_id));

			if (vn_port && (vn_port == lport)) {

				mutex_lock(&fip->ctlr_mutex);

				per_cpu_ptr(lport->dev_stats,

				per_cpu_ptr(lport->stats,

					    get_cpu())->VLinkFailureCount++;

				put_cpu();

				fcoe_ctlr_reset(fip);
@@ -1383,8 +1383,7 @@ static void fcoe_ctlr_recv_clr_vlink(struct fcoe_ctlr *fip, 
		 * followed by physical port

		 */

		mutex_lock(&fip->ctlr_mutex);

		per_cpu_ptr(lport->dev_stats,

			    get_cpu())->VLinkFailureCount++;

		per_cpu_ptr(lport->stats, get_cpu())->VLinkFailureCount++;

		put_cpu();

		fcoe_ctlr_reset(fip);

		mutex_unlock(&fip->ctlr_mutex);

drivers/scsi/fcoe/fcoe_transport.c

+5 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void __fcoe_get_lesb(struct fc_lport *lport, 
{

	unsigned int cpu;

	u32 lfc, vlfc, mdac;

	struct fcoe_dev_stats *devst;

	struct fc_stats *stats;

	struct fcoe_fc_els_lesb *lesb;

	struct rtnl_link_stats64 temp;
@@ -99,10 +99,10 @@ void __fcoe_get_lesb(struct fc_lport *lport, 
	lesb = (struct fcoe_fc_els_lesb *)fc_lesb;

	memset(lesb, 0, sizeof(*lesb));

	for_each_possible_cpu(cpu) {

		devst = per_cpu_ptr(lport->dev_stats, cpu);

		lfc += devst->LinkFailureCount;

		vlfc += devst->VLinkFailureCount;

		mdac += devst->MissDiscAdvCount;

		stats = per_cpu_ptr(lport->stats, cpu);

		lfc += stats->LinkFailureCount;

		vlfc += stats->VLinkFailureCount;

		mdac += stats->MissDiscAdvCount;

	}

	lesb->lesb_link_fail = htonl(lfc);

	lesb->lesb_vlink_fail = htonl(vlfc);