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>

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 13bfc13eb42df6d476ee736b5bd2d4ff2c178e6a..e227b0770221f1337d7f2e54248cfe048ea602db 100644 (file)
--- 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 095ab7fdcf4ba68adc99eb09c493ab770c6638c3..62311bd2df03e11a2ec7b26297b1f1e7816575de 100644 (file)
--- 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;