diff options
Diffstat (limited to 'rpc/rpc-lib')
| -rw-r--r-- | rpc/rpc-lib/src/rpcsvc-common.h | 4 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpcsvc.c | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/rpc/rpc-lib/src/rpcsvc-common.h b/rpc/rpc-lib/src/rpcsvc-common.h index 832645bd12a..dd958032336 100644 --- a/rpc/rpc-lib/src/rpcsvc-common.h +++ b/rpc/rpc-lib/src/rpcsvc-common.h @@ -16,6 +16,7 @@ #include "compat.h" #include "glusterfs.h" #include "dict.h" +#include "xlator.h" typedef enum { RPCSVC_EVENT_ACCEPT, @@ -69,7 +70,8 @@ typedef struct rpcsvc_state { struct list_head notify; int notify_count; - void *mydata; /* This is xlator */ + xlator_t *xl; /* xlator */ + void *mydata; rpcsvc_notify_t notifyfn; struct mem_pool *rxpool; rpcsvc_drc_globals_t *drc; diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c index b395149e032..be95d25b1b1 100644 --- a/rpc/rpc-lib/src/rpcsvc.c +++ b/rpc/rpc-lib/src/rpcsvc.c @@ -677,7 +677,7 @@ rpcsvc_handle_rpc_call (rpcsvc_t *svc, rpc_transport_t *trans, if (req->rpc_err == SUCCESS) { /* Before going to xlator code, set the THIS properly */ - THIS = svc->mydata; + THIS = svc->xl; actor_fn = actor->actor; @@ -1802,7 +1802,7 @@ rpcsvc_register_notify (rpcsvc_t *svc, rpcsvc_notify_t notify, void *mydata) if (!wrapper) { goto out; } - svc->mydata = mydata; /* this_xlator */ + svc->mydata = mydata; wrapper->data = mydata; wrapper->notify = notify; @@ -2045,7 +2045,7 @@ rpcsvc_reconfigure_options (rpcsvc_t *svc, dict_t *options) return (-1); /* Fetch the xlator from svc */ - xlator = (xlator_t *) svc->mydata; + xlator = svc->xl; if (!xlator) return (-1); @@ -2311,7 +2311,7 @@ rpcsvc_init (xlator_t *xl, glusterfs_ctx_t *ctx, dict_t *options, ret = -1; svc->options = options; svc->ctx = ctx; - svc->mydata = xl; + svc->xl = xl; gf_log (GF_RPCSVC, GF_LOG_DEBUG, "RPC service inited."); gluster_dump_prog.options = options; |