Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / scsi / libfc / fc_lport.c

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index e01a298..04ce7cf 100644 (file)
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -301,7 +301,6 @@ struct fc_host_statistics *fc_get_host_stats(struct Scsi_Host *shost)
 {
        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;
@@ -309,9 +308,7 @@ struct fc_host_statistics *fc_get_host_stats(struct Scsi_Host *shost)
        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);
-       fc_stats->seconds_since_last_reset = (v0.tv_sec - v1.tv_sec);
+       fc_stats->seconds_since_last_reset = (lport->boot_time - jiffies) / HZ;
 
        for_each_possible_cpu(cpu) {
                struct fc_stats *stats;
@@ -2090,7 +2087,7 @@ int fc_lport_bsg_request(struct fc_bsg_job *job)
        struct fc_rport *rport;
        struct fc_rport_priv *rdata;
        int rc = -EINVAL;
-       u32 did;
+       u32 did, tov;
 
        job->reply->reply_payload_rcv_len = 0;
        if (rsp)
@@ -2121,15 +2118,20 @@ int fc_lport_bsg_request(struct fc_bsg_job *job)
 
        case FC_BSG_HST_CT:
                did = ntoh24(job->request->rqst_data.h_ct.port_id);
-               if (did == FC_FID_DIR_SERV)
+               if (did == FC_FID_DIR_SERV) {
                        rdata = lport->dns_rdata;
-               else
+                       if (!rdata)
+                               break;
+                       tov = rdata->e_d_tov;
+               } else {
                        rdata = lport->tt.rport_lookup(lport, did);
+                       if (!rdata)
+                               break;
+                       tov = rdata->e_d_tov;
+                       kref_put(&rdata->kref, lport->tt.rport_destroy);
+               }
 
-               if (!rdata)
-                       break;
-
-               rc = fc_lport_ct_request(job, lport, did, rdata->e_d_tov);
+               rc = fc_lport_ct_request(job, lport, did, tov);
                break;
 
        case FC_BSG_HST_ELS_NOLOGIN: