From e4c9a14429c51d8d059287c2a2c7a76a5116a362 Mon Sep 17 00:00:00 2001
From: Ravishankar N <ravishankar@redhat.com>
Date: Mon, 2 Nov 2020 18:03:01 +0530
Subject: xlators: misc conscious language changes (#1715)

core:change xlator_t->ctx->master to xlator_t->ctx->primary
afr: just changed comments.
meta: change .meta/master to .meta/primary. Might break scripts.
changelog: variable/function name changes only.

These are unrelated to geo-rep.
Fixes: #1713

Change-Id: I58eb5fcd75d65fc8269633acc41313503dccf5ff
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
---
 api/src/glfs-internal.h | 4 ++--
 api/src/glfs-mgmt.c     | 6 +++---
 api/src/glfs.c          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'api/src')

diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
index 7cc3b18a10..ed99893003 100644
--- a/api/src/glfs-internal.h
+++ b/api/src/glfs-internal.h
@@ -440,7 +440,7 @@ glfs_process_upcall_event(struct glfs *fs, void *data)
             goto label;                                                        \
         }                                                                      \
         old_THIS = THIS;                                                       \
-        THIS = fs->ctx->master;                                                \
+        THIS = fs->ctx->primary;                                               \
     } while (0)
 
 #define __GLFS_EXIT_FS                                                         \
@@ -456,7 +456,7 @@ glfs_process_upcall_event(struct glfs *fs, void *data)
             goto label;                                                        \
         }                                                                      \
         old_THIS = THIS;                                                       \
-        THIS = glfd->fd->inode->table->xl->ctx->master;                        \
+        THIS = glfd->fd->inode->table->xl->ctx->primary;                       \
     } while (0)
 
 #define __GLFS_LOCK_WAIT(fs)                                                   \
diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
index 7c82b8cd16..0c1d12111b 100644
--- a/api/src/glfs-mgmt.c
+++ b/api/src/glfs-mgmt.c
@@ -275,7 +275,7 @@ mgmt_get_volinfo_cbk(struct rpc_req *req, struct iovec *iov, int count,
         goto out;
     }
 
-    fs = ((xlator_t *)ctx->master)->private;
+    fs = ((xlator_t *)ctx->primary)->private;
 
     if (-1 == req->rpc_status) {
         gf_smsg(frame->this->name, GF_LOG_ERROR, EINVAL,
@@ -566,7 +566,7 @@ glfs_mgmt_getspec_cbk(struct rpc_req *req, struct iovec *iov, int count,
         goto out;
     }
 
-    fs = ((xlator_t *)ctx->master)->private;
+    fs = ((xlator_t *)ctx->primary)->private;
 
     if (-1 == req->rpc_status) {
         ret = -1;
@@ -828,7 +828,7 @@ mgmt_rpc_notify(struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
     if (!ctx)
         goto out;
 
-    fs = ((xlator_t *)ctx->master)->private;
+    fs = ((xlator_t *)ctx->primary)->private;
 
     switch (event) {
         case RPC_CLNT_DISCONNECT:
diff --git a/api/src/glfs.c b/api/src/glfs.c
index b4bf1423f6..d303733723 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -207,7 +207,7 @@ create_master(struct glfs *fs)
         goto err;
     }
 
-    fs->ctx->master = master;
+    fs->ctx->primary = master;
     THIS = master;
 
     return 0;
@@ -1252,7 +1252,7 @@ pub_glfs_fini(struct glfs *fs)
         goto free_fs;
     }
 
-    THIS = fs->ctx->master;
+    THIS = fs->ctx->primary;
 
     if (ctx->mgmt) {
         rpc_clnt_disable(ctx->mgmt);
-- 
cgit