diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-04-28 14:18:50 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-04-28 14:18:50 +0000 |
| commit | e139b4d0ba2286c0d4d44ba81260c2b287016019 (patch) | |
| tree | 0a21f0761528e0f79da0a9f67106eb128ace0cf7 /rpc/xdr/src/rpc-common-xdr.x | |
| parent | 73b60c87ca7f62517a8466431f5a8cf167589c8c (diff) | |
| parent | f2bac9f9d5b9956969ddd25a54bc636b82f6923e (diff) | |
Conflicts:
rpc/xdr/src/glusterfs3-xdr.c
rpc/xdr/src/glusterfs3-xdr.h
xlators/features/changelog/src/Makefile.am
xlators/features/changelog/src/changelog-helpers.h
xlators/features/changelog/src/changelog.c
xlators/mgmt/glusterd/src/glusterd-sm.c
Change-Id: I9972a5e6184503477eb77a8b56c50a4db4eec3e2
Diffstat (limited to 'rpc/xdr/src/rpc-common-xdr.x')
| -rw-r--r-- | rpc/xdr/src/rpc-common-xdr.x | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rpc/xdr/src/rpc-common-xdr.x b/rpc/xdr/src/rpc-common-xdr.x index ca28f38b5..ee66500e0 100644 --- a/rpc/xdr/src/rpc-common-xdr.x +++ b/rpc/xdr/src/rpc-common-xdr.x @@ -10,7 +10,7 @@ struct auth_glusterfs_parms_v2 { }; struct auth_glusterfs_parms { - unsigned hyper lk_owner; + u_quad_t lk_owner; unsigned int pid; unsigned int uid; unsigned int gid; @@ -19,20 +19,20 @@ struct auth_glusterfs_parms { }; struct gf_dump_req { - unsigned hyper gfs_id; + u_quad_t gfs_id; }; struct gf_prog_detail { string progname<>; - unsigned hyper prognum; - unsigned hyper progver; + u_quad_t prognum; + u_quad_t progver; struct gf_prog_detail *next; }; struct gf_dump_rsp { - unsigned hyper gfs_id; + u_quad_t gfs_id; int op_ret; int op_errno; struct gf_prog_detail *prog; |