[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: Vasu Dev <vasu.dev@intel.com> Acked-by : Robert Love <robert.w.love@intel.com> Tested-by: Ross Brattain <ross.b.brattain@intel.com> Acked-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
这个提交包含在:
@@ -299,47 +299,47 @@ EXPORT_SYMBOL(fc_get_host_speed);
|
||||
*/
|
||||
struct fc_host_statistics *fc_get_host_stats(struct Scsi_Host *shost)
|
||||
{
|
||||
struct fc_host_statistics *fcoe_stats;
|
||||
struct fc_host_statistics *fc_stats;
|
||||
struct fc_lport *lport = shost_priv(shost);
|
||||
struct timespec v0, v1;
|
||||
unsigned int cpu;
|
||||
u64 fcp_in_bytes = 0;
|
||||
u64 fcp_out_bytes = 0;
|
||||
|
||||
fcoe_stats = &lport->host_stats;
|
||||
memset(fcoe_stats, 0, sizeof(struct fc_host_statistics));
|
||||
fc_stats = &lport->host_stats;
|
||||
memset(fc_stats, 0, sizeof(struct fc_host_statistics));
|
||||
|
||||
jiffies_to_timespec(jiffies, &v0);
|
||||
jiffies_to_timespec(lport->boot_time, &v1);
|
||||
fcoe_stats->seconds_since_last_reset = (v0.tv_sec - v1.tv_sec);
|
||||
fc_stats->seconds_since_last_reset = (v0.tv_sec - v1.tv_sec);
|
||||
|
||||
for_each_possible_cpu(cpu) {
|
||||
struct fcoe_dev_stats *stats;
|
||||
struct fc_stats *stats;
|
||||
|
||||
stats = per_cpu_ptr(lport->dev_stats, cpu);
|
||||
stats = per_cpu_ptr(lport->stats, cpu);
|
||||
|
||||
fcoe_stats->tx_frames += stats->TxFrames;
|
||||
fcoe_stats->tx_words += stats->TxWords;
|
||||
fcoe_stats->rx_frames += stats->RxFrames;
|
||||
fcoe_stats->rx_words += stats->RxWords;
|
||||
fcoe_stats->error_frames += stats->ErrorFrames;
|
||||
fcoe_stats->invalid_crc_count += stats->InvalidCRCCount;
|
||||
fcoe_stats->fcp_input_requests += stats->InputRequests;
|
||||
fcoe_stats->fcp_output_requests += stats->OutputRequests;
|
||||
fcoe_stats->fcp_control_requests += stats->ControlRequests;
|
||||
fc_stats->tx_frames += stats->TxFrames;
|
||||
fc_stats->tx_words += stats->TxWords;
|
||||
fc_stats->rx_frames += stats->RxFrames;
|
||||
fc_stats->rx_words += stats->RxWords;
|
||||
fc_stats->error_frames += stats->ErrorFrames;
|
||||
fc_stats->invalid_crc_count += stats->InvalidCRCCount;
|
||||
fc_stats->fcp_input_requests += stats->InputRequests;
|
||||
fc_stats->fcp_output_requests += stats->OutputRequests;
|
||||
fc_stats->fcp_control_requests += stats->ControlRequests;
|
||||
fcp_in_bytes += stats->InputBytes;
|
||||
fcp_out_bytes += stats->OutputBytes;
|
||||
fcoe_stats->link_failure_count += stats->LinkFailureCount;
|
||||
fc_stats->link_failure_count += stats->LinkFailureCount;
|
||||
}
|
||||
fcoe_stats->fcp_input_megabytes = div_u64(fcp_in_bytes, 1000000);
|
||||
fcoe_stats->fcp_output_megabytes = div_u64(fcp_out_bytes, 1000000);
|
||||
fcoe_stats->lip_count = -1;
|
||||
fcoe_stats->nos_count = -1;
|
||||
fcoe_stats->loss_of_sync_count = -1;
|
||||
fcoe_stats->loss_of_signal_count = -1;
|
||||
fcoe_stats->prim_seq_protocol_err_count = -1;
|
||||
fcoe_stats->dumped_frames = -1;
|
||||
return fcoe_stats;
|
||||
fc_stats->fcp_input_megabytes = div_u64(fcp_in_bytes, 1000000);
|
||||
fc_stats->fcp_output_megabytes = div_u64(fcp_out_bytes, 1000000);
|
||||
fc_stats->lip_count = -1;
|
||||
fc_stats->nos_count = -1;
|
||||
fc_stats->loss_of_sync_count = -1;
|
||||
fc_stats->loss_of_signal_count = -1;
|
||||
fc_stats->prim_seq_protocol_err_count = -1;
|
||||
fc_stats->dumped_frames = -1;
|
||||
return fc_stats;
|
||||
}
|
||||
EXPORT_SYMBOL(fc_get_host_stats);
|
||||
|
||||
|
在新工单中引用
屏蔽一个用户