From efe088dcba88c4e95279692bda05d8dcf64c0ab4 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Tue, 14 Sep 2010 03:55:24 +0000 Subject: glusterfs3.x file is updated with changes done to xdr.{h, c} files Signed-off-by: Amar Tumballi Signed-off-by: Vijay Bellur BUG: 875 (Implement a new protocol to provide proper backward/forward compatibility) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=875 --- rpc/xdr/src/glusterfs3-xdr.h | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'rpc/xdr/src/glusterfs3-xdr.h') diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h index bcd293da6..654856157 100644 --- a/rpc/xdr/src/glusterfs3-xdr.h +++ b/rpc/xdr/src/glusterfs3-xdr.h @@ -19,8 +19,10 @@ /* - * Please do not edit this file. - * It was generated using rpcgen. + * Most content of this file is generated using rpcgen. There are very few + * additions done to this file (changes can be seen by doing + * 'rpcgen glusterfs3.x' and taking a diff of this file with rpcgen + * generated file. */ #ifndef _GLUSTERFS3_H_RPCGEN @@ -259,7 +261,7 @@ struct gf_iatt { u_int ia_mtime_nsec; u_int ia_ctime; u_int ia_ctime_nsec; -} __attribute__((packed)); +}; typedef struct gf_iatt gf_iatt; @@ -319,7 +321,6 @@ gf_stat_from_iatt (struct gf_iatt *gf_stat, struct iatt *iatt) /* Gluster FS Payload structures */ - struct gfs3_stat_req { u_quad_t gfs_id; u_char gfid[16]; @@ -369,7 +370,6 @@ struct gfs3_mknod_req { u_int dict_len; char *dict_val; } dict; - }; typedef struct gfs3_mknod_req gfs3_mknod_req; @@ -576,8 +576,8 @@ struct gfs3_read_rsp { int op_ret; int op_errno; struct gf_iatt stat; - u_int size; -} __attribute__((packed)); + u_int size; +}; typedef struct gfs3_read_rsp gfs3_read_rsp; struct gfs3_lookup_req { @@ -618,7 +618,7 @@ struct gfs3_write_req { quad_t fd; u_quad_t offset; u_int size; -} __attribute__((packed)); +}; typedef struct gfs3_write_req gfs3_write_req; struct gfs3_write_rsp { @@ -1023,7 +1023,6 @@ struct gfs3_fentrylk_req { }; typedef struct gfs3_fentrylk_req gfs3_fentrylk_req; - struct gfs3_setattr_req { u_quad_t gfs_id; u_char gfid[16]; @@ -1183,7 +1182,6 @@ struct gfs3_readdirp_rsp { }; typedef struct gfs3_readdirp_rsp gfs3_readdirp_rsp; - /* the xdr functions */ #if defined(__STDC__) || defined(__cplusplus) @@ -1242,10 +1240,6 @@ extern bool_t xdr_gfs3_opendir_req (XDR *, gfs3_opendir_req*); extern bool_t xdr_gfs3_opendir_rsp (XDR *, gfs3_opendir_rsp*); extern bool_t xdr_gfs3_fsyncdir_req (XDR *, gfs3_fsyncdir_req*); extern bool_t xdr_gfs3_readdir_req (XDR *, gfs3_readdir_req*); -extern bool_t xdr_gfs3_dirlist (XDR *, gfs3_dirlist*); -extern bool_t xdr_gfs3_readdir_rsp (XDR *, gfs3_readdir_rsp*); -extern bool_t xdr_gfs3_dirplist (XDR *, gfs3_dirplist*); -extern bool_t xdr_gfs3_readdirp_rsp (XDR *, gfs3_readdirp_rsp*); extern bool_t xdr_gfs3_readdirp_req (XDR *, gfs3_readdirp_req*); extern bool_t xdr_gf_setvolume_req (XDR *, gf_setvolume_req*); extern bool_t xdr_gf_setvolume_rsp (XDR *, gf_setvolume_rsp*); @@ -1272,6 +1266,10 @@ extern bool_t xdr_gf_notify_rsp (XDR *, gf_notify_rsp*); extern bool_t xdr_gfs3_releasedir_req (XDR *, gfs3_releasedir_req*); extern bool_t xdr_gfs3_release_req (XDR *, gfs3_release_req*); extern bool_t xdr_gf_common_rsp (XDR *, gf_common_rsp*); +extern bool_t xdr_gfs3_dirlist (XDR *, gfs3_dirlist*); +extern bool_t xdr_gfs3_readdir_rsp (XDR *, gfs3_readdir_rsp*); +extern bool_t xdr_gfs3_dirplist (XDR *, gfs3_dirplist*); +extern bool_t xdr_gfs3_readdirp_rsp (XDR *, gfs3_readdirp_rsp*); #else /* K&R C */ extern bool_t xdr_gf_statfs (); @@ -1329,10 +1327,6 @@ extern bool_t xdr_gfs3_opendir_req (); extern bool_t xdr_gfs3_opendir_rsp (); extern bool_t xdr_gfs3_fsyncdir_req (); extern bool_t xdr_gfs3_readdir_req (); -extern bool_t xdr_gfs3_dirlist (); -extern bool_t xdr_gfs3_readdir_rsp (); -extern bool_t xdr_gfs3_dirplist (); -extern bool_t xdr_gfs3_readdirp_rsp (); extern bool_t xdr_gfs3_readdirp_req (); extern bool_t xdr_gf_setvolume_req (); extern bool_t xdr_gf_setvolume_rsp (); @@ -1351,14 +1345,18 @@ extern bool_t xdr_gfs3_fsetattr_req (); extern bool_t xdr_gfs3_fsetattr_rsp (); extern bool_t xdr_gfs3_rchecksum_req (); extern bool_t xdr_gfs3_rchecksum_rsp (); -extern bool_t xdr_gfs3_releasedir_req (); -extern bool_t xdr_gfs3_release_req (); extern bool_t xdr_gf_getspec_req (); extern bool_t xdr_gf_getspec_rsp (); extern bool_t xdr_gf_log_req (); extern bool_t xdr_gf_notify_req (); extern bool_t xdr_gf_notify_rsp (); +extern bool_t xdr_gfs3_releasedir_req (); +extern bool_t xdr_gfs3_release_req (); extern bool_t xdr_gf_common_rsp (); +extern bool_t xdr_gfs3_dirlist (); +extern bool_t xdr_gfs3_readdir_rsp (); +extern bool_t xdr_gfs3_dirplist (); +extern bool_t xdr_gfs3_readdirp_rsp (); #endif /* K&R C */ -- cgit