summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-09-15 18:14:53 +0200
committerVijay Bellur <vijay@gluster.com>2011-09-15 21:56:12 -0700
commit77cce4c7df9a61b599a27522696720e747714ff2 (patch)
tree709ab25f7c7fd5ad848b64ab69214796dd5cc54c
parent45f03a58a0fbfc1d5e647c764b10e37d0a9ebb26 (diff)
rpc: fix up mountbroker xdr defs and regenerate headers
Change-Id: I8a88d2b9228c3614ee7cbaf48782a419e6aee0f6 BUG: 3482 Reported-by: Krishnan Parthasarathi <kp@gluster.com> Reviewed-on: http://review.gluster.com/432 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krishnan Parthasarathi <kp@gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
-rw-r--r--rpc/xdr/src/cli1-xdr.c56
-rw-r--r--rpc/xdr/src/cli1-xdr.h14
-rw-r--r--rpc/xdr/src/cli1-xdr.x2
3 files changed, 42 insertions, 30 deletions
diff --git a/rpc/xdr/src/cli1-xdr.c b/rpc/xdr/src/cli1-xdr.c
index 9030d3067..25ab32a8f 100644
--- a/rpc/xdr/src/cli1-xdr.c
+++ b/rpc/xdr/src/cli1-xdr.c
@@ -1018,41 +1018,53 @@ xdr_gf1_cli_status_volume_rsp (XDR *xdrs, gf1_cli_status_volume_rsp *objp)
bool_t
xdr_gf1_cli_mount_req (XDR *xdrs, gf1_cli_mount_req *objp)
{
- if (!xdr_string (xdrs, &objp->label, ~0))
- return FALSE;
- if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
- return FALSE;
- return TRUE;
+ register int32_t *buf;
+ buf = NULL;
+
+ if (!xdr_string (xdrs, &objp->label, ~0))
+ return FALSE;
+ if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
+ return FALSE;
+ return TRUE;
}
bool_t
xdr_gf1_cli_mount_rsp (XDR *xdrs, gf1_cli_mount_rsp *objp)
{
- if (!xdr_int (xdrs, &objp->op_ret))
- return FALSE;
- if (!xdr_int (xdrs, &objp->op_errno))
- return FALSE;
- if (!xdr_string (xdrs, &objp->path, ~0))
- return FALSE;
- return TRUE;
+ register int32_t *buf;
+ buf = NULL;
+
+ if (!xdr_int (xdrs, &objp->op_ret))
+ return FALSE;
+ if (!xdr_int (xdrs, &objp->op_errno))
+ return FALSE;
+ if (!xdr_string (xdrs, &objp->path, ~0))
+ return FALSE;
+ return TRUE;
}
bool_t
xdr_gf1_cli_umount_req (XDR *xdrs, gf1_cli_umount_req *objp)
{
- if (!xdr_int (xdrs, &objp->lazy))
- return FALSE;
- if (!xdr_string (xdrs, &objp->path, ~0))
- return FALSE;
- return TRUE;
+ register int32_t *buf;
+ buf = NULL;
+
+ if (!xdr_int (xdrs, &objp->lazy))
+ return FALSE;
+ if (!xdr_string (xdrs, &objp->path, ~0))
+ return FALSE;
+ return TRUE;
}
bool_t
xdr_gf1_cli_umount_rsp (XDR *xdrs, gf1_cli_umount_rsp *objp)
{
- if (!xdr_int (xdrs, &objp->op_ret))
- return FALSE;
- if (!xdr_int (xdrs, &objp->op_errno))
- return FALSE;
- return TRUE;
+ register int32_t *buf;
+ buf = NULL;
+
+ if (!xdr_int (xdrs, &objp->op_ret))
+ return FALSE;
+ if (!xdr_int (xdrs, &objp->op_errno))
+ return FALSE;
+ return TRUE;
}
diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h
index d502c30b4..4077ff3c1 100644
--- a/rpc/xdr/src/cli1-xdr.h
+++ b/rpc/xdr/src/cli1-xdr.h
@@ -587,7 +587,7 @@ struct gf1_cli_status_volume_rsp {
typedef struct gf1_cli_status_volume_rsp gf1_cli_status_volume_rsp;
struct gf1_cli_mount_req {
- char *label;
+ char *label;
struct {
u_int dict_len;
char *dict_val;
@@ -596,21 +596,21 @@ struct gf1_cli_mount_req {
typedef struct gf1_cli_mount_req gf1_cli_mount_req;
struct gf1_cli_mount_rsp {
- int op_ret;
- int op_errno;
+ int op_ret;
+ int op_errno;
char *path;
};
typedef struct gf1_cli_mount_rsp gf1_cli_mount_rsp;
struct gf1_cli_umount_req {
- int lazy;
- char *path;
+ int lazy;
+ char *path;
};
typedef struct gf1_cli_umount_req gf1_cli_umount_req;
struct gf1_cli_umount_rsp {
- int op_ret;
- int op_errno;
+ int op_ret;
+ int op_errno;
};
typedef struct gf1_cli_umount_rsp gf1_cli_umount_rsp;
diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x
index ff2f09af3..2a6168c04 100644
--- a/rpc/xdr/src/cli1-xdr.x
+++ b/rpc/xdr/src/cli1-xdr.x
@@ -451,7 +451,7 @@ struct gf1_cli_umount_req {
string path<>;
};
-struct gf1_cli_mount_rsp {
+struct gf1_cli_umount_rsp {
int op_ret;
int op_errno;
};