diff options
| author | Steffen Maier <maier@linux.ibm.com> | 2018-11-08 15:44:42 +0100 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-11-15 15:01:17 -0500 |
| commit | eb67f93ffa7c3c8c9fbaa9b40d036539cba9879c (patch) | |
| tree | 7e12a3d26d3b388fc80058b466a1703c2e56d8cf /drivers/s390 | |
| parent | e0c1da39d7bdfd06474f7aba5990304a33bbe3be (diff) | |
| download | blackbird-obmc-linux-eb67f93ffa7c3c8c9fbaa9b40d036539cba9879c.tar.gz blackbird-obmc-linux-eb67f93ffa7c3c8c9fbaa9b40d036539cba9879c.zip | |
scsi: zfcp: namespace prefix for internal latency data structures
In contrast to struct fsf_qual_latency_info, the ones here are not FSF but
software defined zfcp-internal.
Signed-off-by: Steffen Maier <maier@linux.ibm.com>
Reviewed-by: Benjamin Block <bblock@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 14 | ||||
| -rw-r--r-- | drivers/s390/scsi/zfcp_fsf.c | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index 13bfc13eb42d..e227b0770221 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h @@ -115,22 +115,22 @@ struct zfcp_erp_action { struct timer_list timer; }; -struct fsf_latency_record { +struct zfcp_latency_record { u32 min; u32 max; u64 sum; }; -struct latency_cont { - struct fsf_latency_record channel; - struct fsf_latency_record fabric; +struct zfcp_latency_cont { + struct zfcp_latency_record channel; + struct zfcp_latency_record fabric; u64 counter; }; struct zfcp_latencies { - struct latency_cont read; - struct latency_cont write; - struct latency_cont cmd; + struct zfcp_latency_cont read; + struct zfcp_latency_cont write; + struct zfcp_latency_cont cmd; spinlock_t lock; }; diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 095ab7fdcf4b..62311bd2df03 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c @@ -1991,7 +1991,7 @@ out: return retval; } -static void zfcp_fsf_update_lat(struct fsf_latency_record *lat_rec, u32 lat) +static void zfcp_fsf_update_lat(struct zfcp_latency_record *lat_rec, u32 lat) { lat_rec->sum += lat; lat_rec->min = min(lat_rec->min, lat); @@ -2001,7 +2001,7 @@ static void zfcp_fsf_update_lat(struct fsf_latency_record *lat_rec, u32 lat) static void zfcp_fsf_req_trace(struct zfcp_fsf_req *req, struct scsi_cmnd *scsi) { struct fsf_qual_latency_info *lat_in; - struct latency_cont *lat = NULL; + struct zfcp_latency_cont *lat = NULL; struct zfcp_scsi_dev *zfcp_sdev; struct zfcp_blk_drv_data blktrc; int ticks = req->adapter->timer_ticks; |
