2 files changed, 4 insertions, 6 deletions
diff --git a/libglusterfs/src/call-stub.c b/libglusterfs/src/call-stub.c
index 886dfa52ccc..3c7c7748c99 100644
--- a/libglusterfs/src/call-stub.c
+++ b/libglusterfs/src/call-stub.c
@@ -16,7 +16,7 @@
 #include "glusterfs/libglusterfs-messages.h"
 
 static call_stub_t *
-stub_new(call_frame_t *frame, char wind, glusterfs_fop_t fop)
+stub_new(call_frame_t *frame, const char wind, const glusterfs_fop_t fop)
 {
     call_stub_t *new = NULL;
 
diff --git a/libglusterfs/src/glusterfs/call-stub.h b/libglusterfs/src/glusterfs/call-stub.h
index c01c935e73d..8237ea459bf 100644
--- a/libglusterfs/src/glusterfs/call-stub.h
+++ b/libglusterfs/src/glusterfs/call-stub.h
@@ -19,15 +19,11 @@
 
 typedef struct _call_stub {
     struct list_head list;
-    char wind;
     call_frame_t *frame;
-    glusterfs_fop_t fop;
-    gf_boolean_t poison;
     struct mem_pool *stub_mem_pool; /* pointer to stub mempool in ctx_t */
     uint32_t jnl_meta_len;
     uint32_t jnl_data_len;
     void (*serialize)(struct _call_stub *, char *, char *);
-
     union {
         fop_lookup_t lookup;
         fop_stat_t stat;
@@ -139,7 +135,9 @@ typedef struct _call_stub {
         fop_namelink_cbk_t namelink;
         fop_copy_file_range_cbk_t copy_file_range;
     } fn_cbk;
-
+    glusterfs_fop_t fop;
+    gf_boolean_t poison;
+    char wind;
     default_args_t args;
     default_args_cbk_t args_cbk;
 } call_stub_t;