glusterfs3.x: change gfid type to opaque

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

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

3 files changed, 140 insertions, 187 deletions

diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c
index d9453c44a..475a1abed 100644
--- a/rpc/xdr/src/glusterfs3-xdr.c
+++ b/rpc/xdr/src/glusterfs3-xdr.c
@@ -77,9 +77,8 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 	register int32_t *buf;
 
 	if (xdrs->x_op == XDR_ENCODE) {
-                if (!xdr_vector (xdrs, (char *)objp->ia_gfid, 16,
-                                 sizeof (u_char), (xdrproc_t) xdr_u_char))
-                        return FALSE;
+		 if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
+			 return FALSE;
 		 if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
 			 return FALSE;
 		 if (!xdr_u_quad_t (xdrs, &objp->ia_gen))
@@ -135,8 +134,7 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 		}
 		return TRUE;
 	} else if (xdrs->x_op == XDR_DECODE) {
-                if (!xdr_vector (xdrs, (char *)objp->ia_gfid, 16,
-                                 sizeof (u_char), (xdrproc_t) xdr_u_char))
+		 if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
                         return FALSE;
 		 if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
 			 return FALSE;
@@ -194,10 +192,8 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 	 return TRUE;
 	}
 
-	 if (!xdr_vector (xdrs, (char *)objp->ia_gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+         if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
 		 return FALSE;
-
 	 if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ia_gen))
@@ -241,8 +237,7 @@ xdr_gfs3_stat_req (XDR *xdrs, gfs3_stat_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -274,9 +269,8 @@ xdr_gfs3_readlink_req (XDR *xdrs, gfs3_readlink_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
-		 return FALSE;
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
+                 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->gen))
@@ -311,8 +305,7 @@ xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-         if (!xdr_vector (xdrs, (char *)objp->pargfid, 16,
-                          sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->par))
 		 return FALSE;
@@ -357,8 +350,7 @@ xdr_gfs3_mkdir_req (XDR *xdrs, gfs3_mkdir_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-         if (!xdr_vector (xdrs, (char *)objp->pargfid, 16,
-                          sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->par))
 		 return FALSE;
@@ -401,8 +393,7 @@ xdr_gfs3_unlink_req (XDR *xdrs, gfs3_unlink_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-         if (!xdr_vector (xdrs, (char *)objp->pargfid, 16,
-                          sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->par))
 		 return FALSE;
@@ -438,8 +429,7 @@ xdr_gfs3_rmdir_req (XDR *xdrs, gfs3_rmdir_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-         if (!xdr_vector (xdrs, (char *)objp->pargfid, 16,
-                          sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->par))
 		 return FALSE;
@@ -475,8 +465,7 @@ xdr_gfs3_symlink_req (XDR *xdrs, gfs3_symlink_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-         if (!xdr_vector (xdrs, (char *)objp->pargfid, 16,
-                          sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->par))
 		 return FALSE;
@@ -519,12 +508,10 @@ xdr_gfs3_rename_req (XDR *xdrs, gfs3_rename_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->oldgfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
-		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->newgfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
-		 return FALSE;
+	 if (!xdr_opaque (xdrs, objp->oldgfid, 16))
+                 return FALSE;
+	 if (!xdr_opaque (xdrs, objp->newgfid, 16))
+                 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->oldpar))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->oldgen))
@@ -573,12 +560,10 @@ xdr_gfs3_link_req (XDR *xdrs, gfs3_link_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->oldgfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
-		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->newgfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
-		 return FALSE;
+	 if (!xdr_opaque (xdrs, objp->oldgfid, 16))
+                 return FALSE;
+	 if (!xdr_opaque (xdrs, objp->newgfid, 16))
+                 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->oldino))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->oldgen))
@@ -621,8 +606,7 @@ xdr_gfs3_truncate_req (XDR *xdrs, gfs3_truncate_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -658,8 +642,7 @@ xdr_gfs3_open_req (XDR *xdrs, gfs3_open_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -695,8 +678,7 @@ xdr_gfs3_read_req (XDR *xdrs, gfs3_read_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -735,11 +717,9 @@ xdr_gfs3_lookup_req (XDR *xdrs, gfs3_lookup_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
-         if (!xdr_vector (xdrs, (char *)objp->pargfid, 16,
-                          sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -785,8 +765,7 @@ xdr_gfs3_write_req (XDR *xdrs, gfs3_write_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -824,8 +803,7 @@ xdr_gfs3_statfs_req (XDR *xdrs, gfs3_statfs_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -857,8 +835,7 @@ xdr_gfs3_lk_req (XDR *xdrs, gfs3_lk_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -896,8 +873,7 @@ xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -922,8 +898,7 @@ xdr_gfs3_finodelk_req (XDR *xdrs, gfs3_finodelk_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -948,8 +923,7 @@ xdr_gfs3_flush_req (XDR *xdrs, gfs3_flush_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -966,8 +940,7 @@ xdr_gfs3_fsync_req (XDR *xdrs, gfs3_fsync_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1003,8 +976,7 @@ xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1025,8 +997,7 @@ xdr_gfs3_fsetxattr_req (XDR *xdrs, gfs3_fsetxattr_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1047,8 +1018,7 @@ xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1084,8 +1054,7 @@ xdr_gfs3_fxattrop_req (XDR *xdrs, gfs3_fxattrop_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1121,8 +1090,7 @@ xdr_gfs3_getxattr_req (XDR *xdrs, gfs3_getxattr_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1158,8 +1126,7 @@ xdr_gfs3_fgetxattr_req (XDR *xdrs, gfs3_fgetxattr_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1195,8 +1162,7 @@ xdr_gfs3_removexattr_req (XDR *xdrs, gfs3_removexattr_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1215,8 +1181,7 @@ xdr_gfs3_opendir_req (XDR *xdrs, gfs3_opendir_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1248,8 +1213,7 @@ xdr_gfs3_fsyncdir_req (XDR *xdrs, gfs3_fsyncdir_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1268,8 +1232,7 @@ xdr_gfs3_readdir_req (XDR *xdrs, gfs3_readdir_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1290,8 +1253,7 @@ xdr_gfs3_readdirp_req (XDR *xdrs, gfs3_readdirp_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1338,8 +1300,7 @@ xdr_gfs3_access_req (XDR *xdrs, gfs3_access_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1358,8 +1319,7 @@ xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-         if (!xdr_vector (xdrs, (char *)objp->pargfid, 16,
-                          sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
                  return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->par))
 		 return FALSE;
@@ -1406,8 +1366,7 @@ xdr_gfs3_ftruncate_req (XDR *xdrs, gfs3_ftruncate_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1443,8 +1402,7 @@ xdr_gfs3_fstat_req (XDR *xdrs, gfs3_fstat_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1476,8 +1434,7 @@ xdr_gfs3_entrylk_req (XDR *xdrs, gfs3_entrylk_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1504,8 +1461,7 @@ xdr_gfs3_fentrylk_req (XDR *xdrs, gfs3_fentrylk_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1533,8 +1489,7 @@ xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1792,8 +1747,7 @@ xdr_gfs3_releasedir_req (XDR *xdrs, gfs3_releasedir_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
@@ -1810,8 +1764,7 @@ xdr_gfs3_release_req (XDR *xdrs, gfs3_release_req *objp)
 
 	 if (!xdr_u_quad_t (xdrs, &objp->gfs_id))
 		 return FALSE;
-	 if (!xdr_vector (xdrs, (char *)objp->gfid, 16,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
+	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ino))
 		 return FALSE;
diff --git a/rpc/xdr/src/glusterfs3-xdr.h b/rpc/xdr/src/glusterfs3-xdr.h
index 654856157..b2f979062 100644
--- a/rpc/xdr/src/glusterfs3-xdr.h
+++ b/rpc/xdr/src/glusterfs3-xdr.h
@@ -243,7 +243,7 @@ gf_flock_from_flock (struct gf_flock *gf_flock, struct flock *flock)
 }
 
 struct gf_iatt {
-	u_char ia_gfid[16];
+	char ia_gfid[16];
 	u_quad_t ia_ino;
 	u_quad_t ia_gen;
 	u_quad_t ia_dev;
@@ -323,7 +323,7 @@ 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];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	char *path;
@@ -340,7 +340,7 @@ typedef struct gfs3_stat_rsp gfs3_stat_rsp;
 
 struct gfs3_readlink_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	u_int size;
@@ -359,7 +359,7 @@ typedef struct gfs3_readlink_rsp gfs3_readlink_rsp;
 
 struct gfs3_mknod_req {
 	u_quad_t gfs_id;
-	u_char pargfid[16];
+	char pargfid[16];
 	u_quad_t par;
 	u_quad_t gen;
 	u_quad_t dev;
@@ -385,7 +385,7 @@ typedef struct gfs3_mknod_rsp gfs3_mknod_rsp;
 
 struct gfs3_mkdir_req {
 	u_quad_t gfs_id;
-	u_char pargfid[16];
+	char pargfid[16];
 	u_quad_t par;
 	u_quad_t gen;
 	u_int mode;
@@ -410,7 +410,7 @@ typedef struct gfs3_mkdir_rsp gfs3_mkdir_rsp;
 
 struct gfs3_unlink_req {
 	u_quad_t gfs_id;
-	u_char pargfid[16];
+	char pargfid[16];
 	u_quad_t par;
 	u_quad_t gen;
 	char *path;
@@ -429,7 +429,7 @@ typedef struct gfs3_unlink_rsp gfs3_unlink_rsp;
 
 struct gfs3_rmdir_req {
 	u_quad_t gfs_id;
-	u_char pargfid[16];
+	char pargfid[16];
 	u_quad_t par;
 	u_quad_t gen;
 	char *path;
@@ -448,7 +448,7 @@ typedef struct gfs3_rmdir_rsp gfs3_rmdir_rsp;
 
 struct gfs3_symlink_req {
 	u_quad_t gfs_id;
-	u_char pargfid[16];
+	char pargfid[16];
 	u_quad_t par;
 	u_quad_t gen;
 	char *path;
@@ -473,8 +473,8 @@ typedef struct gfs3_symlink_rsp gfs3_symlink_rsp;
 
 struct gfs3_rename_req {
 	u_quad_t gfs_id;
-	u_char oldgfid[16];
-	u_char newgfid[16];
+	char oldgfid[16];
+	char newgfid[16];
 	u_quad_t oldpar;
 	u_quad_t oldgen;
 	u_quad_t newpar;
@@ -500,8 +500,8 @@ typedef struct gfs3_rename_rsp gfs3_rename_rsp;
 
 struct gfs3_link_req {
 	u_quad_t gfs_id;
-	u_char oldgfid[16];
-	u_char newgfid[16];
+	char oldgfid[16];
+	char newgfid[16];
 	u_quad_t oldino;
 	u_quad_t oldgen;
 	u_quad_t newpar;
@@ -524,7 +524,7 @@ typedef struct gfs3_link_rsp gfs3_link_rsp;
 
 struct gfs3_truncate_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	u_quad_t offset;
@@ -543,7 +543,7 @@ typedef struct gfs3_truncate_rsp gfs3_truncate_rsp;
 
 struct gfs3_open_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	u_int flags;
@@ -562,7 +562,7 @@ typedef struct gfs3_open_rsp gfs3_open_rsp;
 
 struct gfs3_read_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -582,8 +582,8 @@ typedef struct gfs3_read_rsp gfs3_read_rsp;
 
 struct gfs3_lookup_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
-	u_char pargfid[16];
+	char gfid[16];
+	char pargfid[16];
 	u_quad_t ino;
 	u_quad_t par;
 	u_quad_t gen;
@@ -612,7 +612,7 @@ typedef struct gfs3_lookup_rsp gfs3_lookup_rsp;
 
 struct gfs3_write_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -632,7 +632,7 @@ typedef struct gfs3_write_rsp gfs3_write_rsp;
 
 struct gfs3_statfs_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	char *path;
@@ -649,7 +649,7 @@ typedef struct gfs3_statfs_rsp gfs3_statfs_rsp;
 
 struct gfs3_lk_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -669,7 +669,7 @@ typedef struct gfs3_lk_rsp gfs3_lk_rsp;
 
 struct gfs3_inodelk_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	u_int cmd;
@@ -682,7 +682,7 @@ typedef struct gfs3_inodelk_req gfs3_inodelk_req;
 
 struct gfs3_finodelk_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -695,7 +695,7 @@ typedef struct gfs3_finodelk_req gfs3_finodelk_req;
 
 struct gfs3_flush_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -704,7 +704,7 @@ typedef struct gfs3_flush_req gfs3_flush_req;
 
 struct gfs3_fsync_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -723,7 +723,7 @@ typedef struct gfs3_fsync_rsp gfs3_fsync_rsp;
 
 struct gfs3_setxattr_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	u_int flags;
@@ -737,7 +737,7 @@ typedef struct gfs3_setxattr_req gfs3_setxattr_req;
 
 struct gfs3_fsetxattr_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -751,7 +751,7 @@ typedef struct gfs3_fsetxattr_req gfs3_fsetxattr_req;
 
 struct gfs3_xattrop_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	u_int flags;
@@ -776,7 +776,7 @@ typedef struct gfs3_xattrop_rsp gfs3_xattrop_rsp;
 
 struct gfs3_fxattrop_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -801,7 +801,7 @@ typedef struct gfs3_fxattrop_rsp gfs3_fxattrop_rsp;
 
 struct gfs3_getxattr_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	u_int namelen;
@@ -823,7 +823,7 @@ typedef struct gfs3_getxattr_rsp gfs3_getxattr_rsp;
 
 struct gfs3_fgetxattr_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -845,7 +845,7 @@ typedef struct gfs3_fgetxattr_rsp gfs3_fgetxattr_rsp;
 
 struct gfs3_removexattr_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	char *path;
@@ -855,7 +855,7 @@ typedef struct gfs3_removexattr_req gfs3_removexattr_req;
 
 struct gfs3_opendir_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	char *path;
@@ -872,7 +872,7 @@ typedef struct gfs3_opendir_rsp gfs3_opendir_rsp;
 
 struct gfs3_fsyncdir_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -882,7 +882,7 @@ typedef struct gfs3_fsyncdir_req gfs3_fsyncdir_req;
 
 struct gfs3_readdir_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -893,7 +893,7 @@ typedef struct gfs3_readdir_req gfs3_readdir_req;
 
 struct gfs3_readdirp_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -924,7 +924,7 @@ typedef struct gf_setvolume_rsp gf_setvolume_rsp;
 
 struct gfs3_access_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	u_int mask;
@@ -934,7 +934,7 @@ typedef struct gfs3_access_req gfs3_access_req;
 
 struct gfs3_create_req {
 	u_quad_t gfs_id;
-	u_char pargfid[16];
+	char pargfid[16];
 	u_quad_t par;
 	u_quad_t gen;
 	u_int flags;
@@ -961,7 +961,7 @@ typedef struct gfs3_create_rsp gfs3_create_rsp;
 
 struct gfs3_ftruncate_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -980,7 +980,7 @@ typedef struct gfs3_ftruncate_rsp gfs3_ftruncate_rsp;
 
 struct gfs3_fstat_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -997,7 +997,7 @@ typedef struct gfs3_fstat_rsp gfs3_fstat_rsp;
 
 struct gfs3_entrylk_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	u_int cmd;
@@ -1011,7 +1011,7 @@ typedef struct gfs3_entrylk_req gfs3_entrylk_req;
 
 struct gfs3_fentrylk_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -1025,7 +1025,7 @@ typedef struct gfs3_fentrylk_req gfs3_fentrylk_req;
 
 struct gfs3_setattr_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	struct gf_iatt stbuf;
@@ -1122,7 +1122,7 @@ typedef struct gf_notify_rsp gf_notify_rsp;
 
 struct gfs3_releasedir_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
@@ -1131,7 +1131,7 @@ typedef struct gfs3_releasedir_req gfs3_releasedir_req;
 
 struct gfs3_release_req {
 	u_quad_t gfs_id;
-	u_char gfid[16];
+	char gfid[16];
 	u_quad_t ino;
 	u_quad_t gen;
 	quad_t fd;
diff --git a/rpc/xdr/src/glusterfs3.x b/rpc/xdr/src/glusterfs3.x
index 5d10992a6..646f31071 100644
--- a/rpc/xdr/src/glusterfs3.x
+++ b/rpc/xdr/src/glusterfs3.x
@@ -23,7 +23,7 @@ struct gf_flock {
 
 
 struct gf_iatt {
-        unsigned char      ia_gfid[16];
+        opaque             ia_gfid[16];
         unsigned hyper     ia_ino;        /* inode number */
         unsigned hyper     ia_gen;        /* generation number */
         unsigned hyper     ia_dev;        /* backing device ID */
@@ -45,7 +45,7 @@ struct gf_iatt {
 
 struct gfs3_stat_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
         string         path<>;     /* NULL terminated */
@@ -61,7 +61,7 @@ struct gfs3_stat_rsp {
 
 struct gfs3_readlink_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	unsigned int   size;
@@ -78,7 +78,7 @@ struct gfs3_readlink_req {
 
  struct gfs3_mknod_req {
         unsigned hyper gfs_id;
-        unsigned char  pargfid[16];
+        opaque  pargfid[16];
 	unsigned hyper par;
         unsigned hyper gen;
 	unsigned hyper dev;
@@ -99,7 +99,7 @@ struct gfs3_readlink_req {
 
  struct  gfs3_mkdir_req {
         unsigned hyper gfs_id;
-        unsigned char  pargfid[16];
+        opaque  pargfid[16];
 	unsigned hyper par;
         unsigned hyper gen;
 	unsigned int mode;
@@ -119,7 +119,7 @@ struct gfs3_readlink_req {
 
  struct   gfs3_unlink_req {
         unsigned hyper gfs_id;
-        unsigned char  pargfid[16];
+        opaque  pargfid[16];
 	unsigned hyper par;
         unsigned hyper gen;
 	string     path<>;     /* NULL terminated */
@@ -136,7 +136,7 @@ struct gfs3_readlink_req {
 
  struct   gfs3_rmdir_req {
         unsigned hyper gfs_id;
-        unsigned char  pargfid[16];
+        opaque  pargfid[16];
 	unsigned hyper par;
         unsigned hyper gen;
 	string     path<>;
@@ -153,7 +153,7 @@ struct gfs3_readlink_req {
 
  struct   gfs3_symlink_req {
         unsigned hyper gfs_id;
-        unsigned char  pargfid[16];
+        opaque  pargfid[16];
 	unsigned hyper par;
         unsigned hyper gen;
 	string     path<>;
@@ -173,8 +173,8 @@ struct gfs3_readlink_req {
 
  struct   gfs3_rename_req {
         unsigned hyper gfs_id;
-        unsigned char  oldgfid[16];
-        unsigned char  newgfid[16];
+        opaque  oldgfid[16];
+        opaque  newgfid[16];
 	unsigned hyper   oldpar;
         unsigned hyper   oldgen;
 	unsigned hyper   newpar;
@@ -198,8 +198,8 @@ struct gfs3_readlink_req {
 
  struct  gfs3_link_req {
         unsigned hyper gfs_id;
-        unsigned char  oldgfid[16];
-        unsigned char  newgfid[16];
+        opaque  oldgfid[16];
+        opaque  newgfid[16];
 	unsigned hyper   oldino;
         unsigned hyper   oldgen;
 	unsigned hyper   newpar;
@@ -219,7 +219,7 @@ struct gfs3_readlink_req {
 
  struct   gfs3_truncate_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	unsigned hyper offset;
@@ -236,7 +236,7 @@ struct gfs3_readlink_req {
 
  struct   gfs3_open_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	unsigned int flags;
@@ -253,7 +253,7 @@ struct gfs3_readlink_req {
 
  struct   gfs3_read_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -270,8 +270,8 @@ struct gfs3_readlink_req {
 
 struct   gfs3_lookup_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
-        unsigned char  pargfid[16];
+        opaque gfid[16];
+        opaque  pargfid[16];
 	unsigned hyper ino; /* NOTE: used only in case of 'root' lookup */
 	unsigned hyper par;
         unsigned hyper gen;
@@ -293,7 +293,7 @@ struct   gfs3_lookup_req {
 
  struct   gfs3_write_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -311,7 +311,7 @@ struct   gfs3_lookup_req {
 
  struct gfs3_statfs_req  {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	string     path<>;
@@ -325,7 +325,7 @@ struct   gfs3_lookup_req {
 
  struct gfs3_lk_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper        ino;
         unsigned hyper        gen;
 	hyper         fd;
@@ -342,7 +342,7 @@ struct   gfs3_lookup_req {
 
  struct gfs3_inodelk_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	unsigned int cmd;
@@ -354,7 +354,7 @@ struct   gfs3_lookup_req {
 
 struct   gfs3_finodelk_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -367,7 +367,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_flush_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -376,7 +376,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_fsync_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -393,7 +393,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_setxattr_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	unsigned int flags;
@@ -405,7 +405,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_fsetxattr_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
         unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -417,7 +417,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_xattrop_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	unsigned int flags;
@@ -435,7 +435,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_fxattrop_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -453,7 +453,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_getxattr_req  {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	unsigned int namelen;
@@ -470,7 +470,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_fgetxattr_req  {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
         unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -487,7 +487,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_removexattr_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	string     path<>;
@@ -498,7 +498,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_opendir_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	string     path<>;
@@ -513,7 +513,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_fsyncdir_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -522,7 +522,7 @@ struct   gfs3_finodelk_req {
 
  struct   gfs3_readdir_req  {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -532,7 +532,7 @@ struct   gfs3_finodelk_req {
 
  struct gfs3_readdirp_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -554,7 +554,7 @@ struct   gfs3_finodelk_req {
 
 struct gfs3_access_req  {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	unsigned int mask;
@@ -564,7 +564,7 @@ struct gfs3_access_req  {
 
 struct gfs3_create_req {
         unsigned hyper gfs_id;
-        unsigned char  pargfid[16];
+        opaque  pargfid[16];
 	unsigned hyper par;
         unsigned hyper gen;
 	unsigned int flags;
@@ -587,7 +587,7 @@ struct  gfs3_create_rsp {
 
 struct   gfs3_ftruncate_req  {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -604,7 +604,7 @@ struct   gfs3_ftruncate_rsp {
 
 struct gfs3_fstat_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -620,7 +620,7 @@ struct gfs3_fstat_req {
 
  struct   gfs3_entrylk_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper  ino;
         unsigned hyper  gen;
 	unsigned int  cmd;
@@ -633,7 +633,7 @@ struct gfs3_fstat_req {
 
  struct   gfs3_fentrylk_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper  ino;
         unsigned hyper  gen;
 	hyper   fd;
@@ -647,7 +647,7 @@ struct gfs3_fstat_req {
 
  struct gfs3_setattr_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
         unsigned hyper       ino;
         unsigned hyper       gen;
         struct gf_iatt stbuf;
@@ -724,7 +724,7 @@ struct gfs3_fstat_req {
 
 struct gfs3_releasedir_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;
@@ -732,7 +732,7 @@ struct gfs3_releasedir_req {
 
 struct gfs3_release_req {
         unsigned hyper gfs_id;
-        unsigned char  gfid[16];
+        opaque gfid[16];
 	unsigned hyper ino;
         unsigned hyper gen;
 	hyper  fd;