2 files changed, 12 insertions, 31 deletions

diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c
index 4f16d148262..7fe4b3c3a4b 100644
--- a/xlators/performance/quick-read/src/quick-read.c
+++ b/xlators/performance/quick-read/src/quick-read.c
@@ -421,9 +421,6 @@ qr_content_update(xlator_t *this, qr_inode_t *qr_inode, void *data,
     qr_private_t *priv = NULL;
     qr_inode_table_t *table = NULL;
     uint32_t rollover = 0;
-    struct timeval tv = {
-        0,
-    };
 
     rollover = gen >> 32;
     gen = gen & 0xffffffff;
@@ -431,7 +428,6 @@ qr_content_update(xlator_t *this, qr_inode_t *qr_inode, void *data,
     priv = this->private;
     table = &priv->table;
 
-    gettimeofday(&tv, NULL);
     LOCK(&table->lock);
     {
         if ((rollover != qr_inode->gen_rollover) ||
@@ -453,8 +449,7 @@ qr_content_update(xlator_t *this, qr_inode_t *qr_inode, void *data,
         qr_inode->ia_ctime_nsec = buf->ia_ctime_nsec;
 
         qr_inode->buf = *buf;
-
-        memcpy(&qr_inode->last_refresh, &tv, sizeof(struct timeval));
+        qr_inode->last_refresh = gf_time();
 
         __qr_inode_register(this, table, qr_inode);
     }
@@ -524,9 +519,7 @@ __qr_content_refresh(xlator_t *this, qr_inode_t *qr_inode, struct iatt *buf,
 
     if (qr_size_fits(conf, buf) && qr_time_equal(conf, qr_inode, buf)) {
         qr_inode->buf = *buf;
-
-        gettimeofday(&qr_inode->last_refresh, NULL);
-
+        qr_inode->last_refresh = gf_time();
         __qr_inode_register(this, table, qr_inode);
     } else {
         __qr_inode_prune(this, table, qr_inode, gen);
@@ -558,20 +551,14 @@ __qr_cache_is_fresh(xlator_t *this, qr_inode_t *qr_inode)
 {
     qr_conf_t *conf = NULL;
     qr_private_t *priv = NULL;
-    struct timeval now;
-    struct timeval diff;
 
     priv = this->private;
     conf = &priv->conf;
 
-    gettimeofday(&now, NULL);
-
-    timersub(&now, &qr_inode->last_refresh, &diff);
-
-    if (qr_inode->last_refresh.tv_sec < priv->last_child_down)
+    if (qr_inode->last_refresh < priv->last_child_down)
         return _gf_false;
 
-    if (diff.tv_sec >= conf->cache_timeout)
+    if (gf_time() - qr_inode->last_refresh >= conf->cache_timeout)
         return _gf_false;
 
     return _gf_true;
@@ -1034,7 +1021,7 @@ qr_inodectx_dump(xlator_t *this, inode_t *inode)
     char key_prefix[GF_DUMP_MAX_BUF_LEN] = {
         0,
     };
-    char buf[256] = {
+    char buf[GF_TIMESTR_SIZE] = {
         0,
     };
 
@@ -1049,12 +1036,8 @@ qr_inodectx_dump(xlator_t *this, inode_t *inode)
     gf_proc_dump_write("entire-file-cached", "%s",
                        qr_inode->data ? "yes" : "no");
 
-    if (qr_inode->last_refresh.tv_sec) {
-        gf_time_fmt(buf, sizeof buf, qr_inode->last_refresh.tv_sec,
-                    gf_timefmt_FT);
-        snprintf(buf + strlen(buf), sizeof buf - strlen(buf),
-                 ".%" GF_PRI_SUSECONDS, qr_inode->last_refresh.tv_usec);
-
+    if (qr_inode->last_refresh) {
+        gf_time_fmt(buf, sizeof buf, qr_inode->last_refresh, gf_timefmt_FT);
         gf_proc_dump_write("last-cache-validation-time", "%s", buf);
     }
 
@@ -1407,7 +1390,7 @@ qr_init(xlator_t *this)
 
     ret = 0;
 
-    time(&priv->last_child_down);
+    priv->last_child_down = gf_time();
     GF_ATOMIC_INIT(priv->generation, 0);
     this->private = priv;
 out:
@@ -1457,7 +1440,7 @@ qr_conf_destroy(qr_conf_t *conf)
 }
 
 void
-qr_update_child_down_time(xlator_t *this, time_t *now)
+qr_update_child_down_time(xlator_t *this, time_t now)
 {
     qr_private_t *priv = NULL;
 
@@ -1465,7 +1448,7 @@ qr_update_child_down_time(xlator_t *this, time_t *now)
 
     LOCK(&priv->lock);
     {
-        priv->last_child_down = *now;
+        priv->last_child_down = now;
     }
     UNLOCK(&priv->lock);
 }
@@ -1511,7 +1494,6 @@ qr_notify(xlator_t *this, int event, void *data, ...)
 {
     int ret = 0;
     qr_private_t *priv = NULL;
-    time_t now = 0;
     qr_conf_t *conf = NULL;
 
     priv = this->private;
@@ -1520,8 +1502,7 @@ qr_notify(xlator_t *this, int event, void *data, ...)
     switch (event) {
         case GF_EVENT_CHILD_DOWN:
         case GF_EVENT_SOME_DESCENDENT_DOWN:
-            time(&now);
-            qr_update_child_down_time(this, &now);
+            qr_update_child_down_time(this, gf_time());
             break;
         case GF_EVENT_UPCALL:
             if (conf->qr_invalidation)
diff --git a/xlators/performance/quick-read/src/quick-read.h b/xlators/performance/quick-read/src/quick-read.h
index 67850821b8e..20fcc70b3a7 100644
--- a/xlators/performance/quick-read/src/quick-read.h
+++ b/xlators/performance/quick-read/src/quick-read.h
@@ -39,7 +39,7 @@ struct qr_inode {
     uint32_t ia_ctime_nsec;
     uint32_t gen_rollover;
     struct iatt buf;
-    struct timeval last_refresh;
+    time_t last_refresh;
     struct list_head lru;
     uint64_t gen;
     uint64_t invalidation_time;