7 files changed, 13 insertions, 13 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.h b/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.h
index d1c4607795a..1b225621ab1 100644
--- a/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.h
+++ b/xlators/mgmt/glusterd/src/glusterd-conn-mgmt.h
@@ -20,11 +20,11 @@ typedef int (*glusterd_conn_notify_t)(glusterd_conn_t *conn,
 
 struct glusterd_conn_ {
     struct rpc_clnt *rpc;
-    char sockpath[PATH_MAX];
-    int frame_timeout;
     /* Existing daemons tend to specialize their respective
      * notify implementations, so ... */
     glusterd_conn_notify_t notify;
+    int frame_timeout;
+    char sockpath[PATH_MAX];
 };
 
 int
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.h b/xlators/mgmt/glusterd/src/glusterd-geo-rep.h
index 5f5fe344406..7d1318f522c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.h
+++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.h
@@ -30,8 +30,8 @@ typedef struct glusterd_gsync_status_temp {
 } glusterd_gsync_status_temp_t;
 
 typedef struct gsync_status_param {
-    int is_active;
     glusterd_volinfo_t *volinfo;
+    int is_active;
 } gsync_status_param_t;
 
 int
diff --git a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.h b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.h
index db1c8b1e7b0..d396b4015f3 100644
--- a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.h
+++ b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.h
@@ -17,8 +17,8 @@
 
 struct glusterd_gfproxydsvc_ {
     glusterd_svc_t svc;
-    int port;
     gf_store_handle_t *handle;
+    int port;
 };
 
 typedef struct glusterd_gfproxydsvc_ glusterd_gfproxydsvc_t;
diff --git a/xlators/mgmt/glusterd/src/glusterd-hooks.h b/xlators/mgmt/glusterd/src/glusterd-hooks.h
index 3813c18e989..f8b887b9bd7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-hooks.h
+++ b/xlators/mgmt/glusterd/src/glusterd-hooks.h
@@ -34,17 +34,17 @@ typedef enum glusterd_commit_hook_type {
 
 typedef struct hooks_private {
     struct cds_list_head list;
-    int waitcount;  // debug purposes
     pthread_mutex_t mutex;
     pthread_cond_t cond;
     pthread_t worker;
+    int waitcount;  // debug purposes
 } glusterd_hooks_private_t;
 
 typedef struct hooks_stub {
     struct cds_list_head all_hooks;
     char *scriptdir;
-    glusterd_op_t op;
     dict_t *op_ctx;
+    glusterd_op_t op;
 
 } glusterd_hooks_stub_t;
 
diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.h b/xlators/mgmt/glusterd/src/glusterd-pmap.h
index ca063ed6a3d..51d75361431 100644
--- a/xlators/mgmt/glusterd/src/glusterd-pmap.h
+++ b/xlators/mgmt/glusterd/src/glusterd-pmap.h
@@ -21,16 +21,16 @@
 #include "rpcsvc.h"
 
 struct pmap_port_status {
-    gf_pmap_port_type_t type;
     char *brickname;
     void *xprt;
+    gf_pmap_port_type_t type;
 };
 
 struct pmap_registry {
+    struct pmap_port_status ports[GF_PORT_MAX + 1];
     int base_port;
     int max_port;
     int last_alloc;
-    struct pmap_port_status ports[GF_PORT_MAX + 1];
 };
 
 int
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.h b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.h
index c95e4cc7661..e15dbf54315 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.h
+++ b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.h
@@ -17,8 +17,8 @@ typedef struct glusterd_snapdsvc_ glusterd_snapdsvc_t;
 
 struct glusterd_snapdsvc_ {
     glusterd_svc_t svc;
-    int port;
     gf_store_handle_t *handle;
+    int port;
 };
 
 void
diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.h b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.h
index 4d96b3af682..5daee993833 100644
--- a/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.h
+++ b/xlators/mgmt/glusterd/src/glusterd-svc-mgmt.h
@@ -49,17 +49,17 @@ struct glusterd_svc_proc_ {
 };
 
 struct glusterd_svc_ {
-    char name[NAME_MAX];
     glusterd_conn_t conn;
-    glusterd_proc_t proc;
     glusterd_svc_manager_t manager;
     glusterd_svc_start_t start;
     glusterd_svc_stop_t stop;
-    gf_boolean_t online;
-    gf_boolean_t inited;
     glusterd_svc_reconfigure_t reconfigure;
     glusterd_svc_proc_t *svc_proc;
     struct cds_list_head mux_svc;
+    glusterd_proc_t proc;
+    char name[NAME_MAX];
+    gf_boolean_t online;
+    gf_boolean_t inited;
 };
 
 int