From 97fdc05ab86ca2af992c42b09ed40413be2ef0d8 Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Fri, 29 Apr 2011 06:24:40 +0000 Subject: glusterd / cli / rpc: move geo-replication reply parameters into dict Signed-off-by: Csaba Henk Signed-off-by: Anand Avati BUG: 2785 (gsyncd logs on slave side go to /dev/null) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2785 --- rpc/xdr/src/cli1-xdr.c | 16 ++-------------- rpc/xdr/src/cli1-xdr.h | 12 +++--------- rpc/xdr/src/cli1-xdr.x | 8 +------- 3 files changed, 6 insertions(+), 30 deletions(-) (limited to 'rpc') diff --git a/rpc/xdr/src/cli1-xdr.c b/rpc/xdr/src/cli1-xdr.c index e0a1e1075..e525bb755 100644 --- a/rpc/xdr/src/cli1-xdr.c +++ b/rpc/xdr/src/cli1-xdr.c @@ -749,20 +749,8 @@ xdr_gf1_cli_gsync_set_rsp (XDR *xdrs, gf1_cli_gsync_set_rsp *objp) return FALSE; if (!xdr_int (xdrs, &objp->type)) return FALSE; - if (!xdr_string (xdrs, &objp->op_name, ~0)) - return FALSE; - if (!xdr_string (xdrs, &objp->subop, ~0)) - return FALSE; - if (!xdr_string (xdrs, &objp->master, ~0)) - return FALSE; - if (!xdr_string (xdrs, &objp->slave, ~0)) - return FALSE; - if (!xdr_string (xdrs, &objp->gsync_prefix, ~0)) - return FALSE; - if (!xdr_string (xdrs, &objp->glusterd_workdir, ~0)) - return FALSE; - if (!xdr_bytes (xdrs, (char **)&objp->status_dict.status_dict_val, - (u_int *) &objp->status_dict.status_dict_len, ~0)) + if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, + (u_int *) &objp->dict.dict_len, ~0)) return FALSE; return TRUE; diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h index 5b6bfd8f1..42e5cbff8 100644 --- a/rpc/xdr/src/cli1-xdr.h +++ b/rpc/xdr/src/cli1-xdr.h @@ -474,16 +474,10 @@ struct gf1_cli_gsync_set_rsp { int op_errno; char *op_errstr; int type; - char *op_name; - char *subop; - char *master; - char *slave; - char *gsync_prefix; - char *glusterd_workdir; struct { - u_int status_dict_len; - char *status_dict_val; - } status_dict; + u_int dict_len; + char *dict_val; + } dict; }; typedef struct gf1_cli_gsync_set_rsp gf1_cli_gsync_set_rsp; diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index 154a2c8e3..4b15dcd29 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -338,13 +338,7 @@ struct gf1_cli_gsync_set_rsp { int op_errno; string op_errstr<>; int type; - string op_name<>; - string subop<>; - string master<>; - string slave<>; - string gsync_prefix<>; - string glusterd_workdir<>; - opaque status_dict<>; + opaque dict<>; }; struct gf1_cli_stats_volume_req { -- cgit