7 files changed, 15 insertions, 10 deletions
diff --git a/xlators/nfs/server/src/acl3.c b/xlators/nfs/server/src/acl3.c
index 3745188c7a5..7e3bbf16086 100644
--- a/xlators/nfs/server/src/acl3.c
+++ b/xlators/nfs/server/src/acl3.c
@@ -753,8 +753,7 @@ acl3svc_init(xlator_t *nfsx)
         goto err;
     }
 
-    ret = dict_set_dynstr(options, "transport.socket.listen-port",
-                          GF_ACL3_PORT);
+    ret = dict_set_str(options, "transport.socket.listen-port", GF_ACL3_PORT);
     if (ret == -1)
         goto err;
     ret = dict_set_str(options, "transport-type", "socket");
diff --git a/xlators/nfs/server/src/auth-cache.c b/xlators/nfs/server/src/auth-cache.c
index 64768646074..ffbf5b6cad6 100644
--- a/xlators/nfs/server/src/auth-cache.c
+++ b/xlators/nfs/server/src/auth-cache.c
@@ -189,7 +189,7 @@ out:
 static int
 _auth_cache_expired(struct auth_cache *cache, struct auth_cache_entry *entry)
 {
-    return ((time(NULL) - entry->timestamp) > cache->ttl_sec);
+    return ((gf_time() - entry->timestamp) > cache->ttl_sec);
 }
 
 /**
@@ -474,7 +474,7 @@ cache_nfs_fh(struct auth_cache *cache, struct nfs3_fh *fh,
         goto out;
     }
 
-    entry->timestamp = time(NULL);
+    entry->timestamp = gf_time();
     /* Update entry->item if it is pointing to a different export_item */
     if (entry->item && entry->item != export_item) {
         GF_REF_PUT(entry->item);
diff --git a/xlators/nfs/server/src/mount3udp_svc.c b/xlators/nfs/server/src/mount3udp_svc.c
index 0688779eb65..1a2b0f85453 100644
--- a/xlators/nfs/server/src/mount3udp_svc.c
+++ b/xlators/nfs/server/src/mount3udp_svc.c
@@ -216,7 +216,7 @@ mount3udp_thread(void *argv)
 
     GF_ASSERT(nfsx);
 
-    glusterfs_this_set(nfsx);
+    THIS = nfsx;
 
     transp = svcudp_create(RPC_ANYSOCK);
     if (transp == NULL) {
diff --git a/xlators/nfs/server/src/nfs3-helpers.c b/xlators/nfs/server/src/nfs3-helpers.c
index 8a58977b53c..897fb42b071 100644
--- a/xlators/nfs/server/src/nfs3-helpers.c
+++ b/xlators/nfs/server/src/nfs3-helpers.c
@@ -1072,7 +1072,7 @@ nfs3_sattr3_to_setattr_valid(sattr3 *sattr, struct iatt *buf, mode_t *omode)
     if (sattr->atime.set_it == SET_TO_SERVER_TIME) {
         valid |= GF_SET_ATTR_ATIME;
         if (buf)
-            buf->ia_atime = time(NULL);
+            buf->ia_atime = gf_time();
     }
 
     if (sattr->mtime.set_it == SET_TO_CLIENT_TIME) {
@@ -1084,7 +1084,7 @@ nfs3_sattr3_to_setattr_valid(sattr3 *sattr, struct iatt *buf, mode_t *omode)
     if (sattr->mtime.set_it == SET_TO_SERVER_TIME) {
         valid |= GF_SET_ATTR_MTIME;
         if (buf)
-            buf->ia_mtime = time(NULL);
+            buf->ia_mtime = gf_time();
     }
 
     return valid;
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index 7cfd75f9ed1..f9042bc3b3f 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -5651,7 +5651,7 @@ nfs3_init_state(xlator_t *nfsx)
         goto free_localpool;
     }
 
-    nfs3->serverstart = (uint64_t)time(NULL);
+    nfs3->serverstart = (uint64_t)gf_time();
     INIT_LIST_HEAD(&nfs3->fdlru);
     LOCK_INIT(&nfs3->fdlrulock);
     nfs3->fdcount = 0;
diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index c909e3bc093..577e8543966 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -1011,7 +1011,8 @@ nlm4_establish_callback(nfs3_call_state_t *cs, call_frame_t *cbk_frame)
     int port = -1;
     struct nlm4_notify_args *ncf = NULL;
 
-    glusterfs_this_set(cs->nfsx);
+    GF_ASSERT(cs->nfsx);
+    THIS = cs->nfsx;
 
     rpc_transport_get_peeraddr(cs->trans, NULL, 0, &sock_union.storage,
                                sizeof(sock_union.storage));
@@ -2714,7 +2715,7 @@ nlm4svc_init(xlator_t *nfsx)
         goto err;
     }
 
-    (void)gf_thread_create(&thr, NULL, nsm_thread, (void *)NULL, "nfsnsm");
+    (void)gf_thread_create(&thr, NULL, nsm_thread, nfsx, "nfsnsm");
 
     timeout.tv_sec = nlm_grace_period;
     timeout.tv_nsec = 0;
diff --git a/xlators/nfs/server/src/nlmcbk_svc.c b/xlators/nfs/server/src/nlmcbk_svc.c
index d18b86ce8db..eaa7b916190 100644
--- a/xlators/nfs/server/src/nlmcbk_svc.c
+++ b/xlators/nfs/server/src/nlmcbk_svc.c
@@ -84,9 +84,14 @@ nlmcbk_program_0(struct svc_req *rqstp, register SVCXPRT *transp)
 void *
 nsm_thread(void *argv)
 {
+    xlator_t *nfsx = argv;
     register SVCXPRT *transp;
     int ret = 0;
 
+    GF_ASSERT(nfsx);
+
+    THIS = nfsx;
+
     ret = pmap_unset(NLMCBK_PROGRAM, NLMCBK_V1);
     if (ret == 0) {
         gf_msg(GF_NLM, GF_LOG_ERROR, 0, NFS_MSG_PMAP_UNSET_FAIL,