summaryrefslogtreecommitdiffstats
path: root/rpc/xdr/src
diff options
context:
space:
mode:
Diffstat (limited to 'rpc/xdr/src')
-rw-r--r--rpc/xdr/src/glusterfs-fops.x2
-rw-r--r--rpc/xdr/src/glusterfs4-xdr.x30
-rw-r--r--rpc/xdr/src/rpc-common-xdr.x22
3 files changed, 31 insertions, 23 deletions
diff --git a/rpc/xdr/src/glusterfs-fops.x b/rpc/xdr/src/glusterfs-fops.x
index 44e5d9191a2..1cb2d83c161 100644
--- a/rpc/xdr/src/glusterfs-fops.x
+++ b/rpc/xdr/src/glusterfs-fops.x
@@ -239,5 +239,7 @@ enum gf_dict_data_type_t {
GF_DATA_TYPE_DOUBLE,
GF_DATA_TYPE_STR,
GF_DATA_TYPE_PTR,
+ GF_DATA_TYPE_GFUUID,
+ GF_DATA_TYPE_IATT,
GF_DATA_TYPE_MAX
};
diff --git a/rpc/xdr/src/glusterfs4-xdr.x b/rpc/xdr/src/glusterfs4-xdr.x
index a4fc9b22850..7396b566fa7 100644
--- a/rpc/xdr/src/glusterfs4-xdr.x
+++ b/rpc/xdr/src/glusterfs4-xdr.x
@@ -12,10 +12,38 @@
%#include "rpc-pragmas.h"
#endif
%#include "compat.h"
-%#include "rpc-common-xdr.h"
%#include "glusterfs-fops.h"
%#include "glusterfs3-xdr.h"
+
+union gfx_value switch (gf_dict_data_type_t type) {
+ case GF_DATA_TYPE_INT:
+ hyper value_int;
+ case GF_DATA_TYPE_UINT:
+ unsigned hyper value_uint;
+ case GF_DATA_TYPE_DOUBLE:
+ double value_dbl;
+ case GF_DATA_TYPE_STR:
+ opaque val_string<>;
+ case GF_DATA_TYPE_IATT:
+ gf_iatt iatt;
+ case GF_DATA_TYPE_GFUUID:
+ opaque uuid[20];
+ case GF_DATA_TYPE_PTR:
+ opaque other<>;
+};
+
+struct gfx_dict_pair {
+ opaque key<>;
+ gfx_value value;
+};
+
+struct gfx_dict {
+ unsigned int count;
+ gfx_dict_pair pairs<>;
+};
+
+/* fops */
struct gfs3_fsetattr_req_v2 {
opaque gfid[16];
hyper fd;
diff --git a/rpc/xdr/src/rpc-common-xdr.x b/rpc/xdr/src/rpc-common-xdr.x
index 1af7c8041ed..b01d282f368 100644
--- a/rpc/xdr/src/rpc-common-xdr.x
+++ b/rpc/xdr/src/rpc-common-xdr.x
@@ -65,25 +65,3 @@ struct gf_common_rsp {
int op_errno;
opaque xdata<>; /* Extra data */
} ;
-
-
-union gfx_value switch (gf_dict_data_type_t type) {
- case GF_DATA_TYPE_INT:
- hyper value_int;
- case GF_DATA_TYPE_UINT:
- unsigned hyper value_uint;
- case GF_DATA_TYPE_DOUBLE:
- double value_dbl;
- case GF_DATA_TYPE_STR:
- opaque val_string<>;
-};
-
-struct gfx_dict_pair {
- opaque key<>;
- gfx_value value;
-};
-
-struct gfx_dict {
- unsigned int count;
- gfx_dict_pair pairs<>;
-};