modify to the way we used XDR definitions files (.x files)

Earlier:
step 1: copy the existing <xdr>.x files to /tmp
step 2: generate '.[ch]' files using 'rpcgen <xdr>.x'
step 3: check diff with the to the existing files, add only your part
        of changes back to the original file. (ignore other changes).
step 4: there is another file to write wrapper functions to convert
        structures to/from XDR buffers, update it with your new structure.
step 5: use these wrapper functions in the newly written procedures.
step 6: commit :-|

Now:
step 1: update (mostly adding only) the <xdr>.x file
step 2: run '<path-to-src>/extras/generate-xdr-files.sh <xdr>.x' command
step 3: implement rpc procedure to handle the request/response.
step 4: commit :-)

Change-Id: I219f9159fc980438c86e847c6b030be96e595ea2
BUG: 3488
Reviewed-on: http://review.gluster.com/341
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@gluster.com>

1 files changed, 200 insertions, 36 deletions

diff --git a/rpc/xdr/src/glusterfs3-xdr.c b/rpc/xdr/src/glusterfs3-xdr.c
index cc43f22cf95..83a2bf9e07d 100644
--- a/rpc/xdr/src/glusterfs3-xdr.c
+++ b/rpc/xdr/src/glusterfs3-xdr.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  Copyright (c) 2007-2011 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
   GlusterFS is free software; you can redistribute it and/or modify
@@ -17,6 +17,7 @@
   <http://www.gnu.org/licenses/>.
 */
 
+#include "xdr-common.h"
 
 /*
  * Please do not edit this file.
@@ -24,11 +25,12 @@
  */
 
 #include "glusterfs3-xdr.h"
-#include "compat.h"
 
 bool_t
 xdr_gf_statfs (XDR *xdrs, gf_statfs *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_u_quad_t (xdrs, &objp->bsize))
 		 return FALSE;
@@ -58,6 +60,8 @@ xdr_gf_statfs (XDR *xdrs, gf_statfs *objp)
 bool_t
 xdr_gf_proto_flock (XDR *xdrs, gf_proto_flock *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_u_int (xdrs, &objp->type))
 		 return FALSE;
@@ -78,6 +82,8 @@ bool_t
 xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 {
 	register int32_t *buf;
+        buf = NULL;
+
 
 	if (xdrs->x_op == XDR_ENCODE) {
 		 if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
@@ -136,7 +142,7 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 		return TRUE;
 	} else if (xdrs->x_op == XDR_DECODE) {
 		 if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
-                        return FALSE;
+			 return FALSE;
 		 if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
 			 return FALSE;
 		 if (!xdr_u_quad_t (xdrs, &objp->ia_dev))
@@ -191,7 +197,7 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 	 return TRUE;
 	}
 
-         if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
+	 if (!xdr_opaque (xdrs, objp->ia_gfid, 16))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->ia_ino))
 		 return FALSE;
@@ -231,6 +237,8 @@ xdr_gf_iatt (XDR *xdrs, gf_iatt *objp)
 bool_t
 xdr_gfs3_stat_req (XDR *xdrs, gfs3_stat_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -242,6 +250,8 @@ xdr_gfs3_stat_req (XDR *xdrs, gfs3_stat_req *objp)
 bool_t
 xdr_gfs3_stat_rsp (XDR *xdrs, gfs3_stat_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -255,9 +265,11 @@ xdr_gfs3_stat_rsp (XDR *xdrs, gfs3_stat_rsp *objp)
 bool_t
 xdr_gfs3_readlink_req (XDR *xdrs, gfs3_readlink_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->size))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
@@ -268,6 +280,8 @@ xdr_gfs3_readlink_req (XDR *xdrs, gfs3_readlink_req *objp)
 bool_t
 xdr_gfs3_readlink_rsp (XDR *xdrs, gfs3_readlink_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -283,9 +297,11 @@ xdr_gfs3_readlink_rsp (XDR *xdrs, gfs3_readlink_rsp *objp)
 bool_t
 xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->dev))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mode))
@@ -294,8 +310,7 @@ xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
-                         (u_int *) &objp->dict.dict_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -303,6 +318,8 @@ xdr_gfs3_mknod_req (XDR *xdrs, gfs3_mknod_req *objp)
 bool_t
 xdr_gfs3_mknod_rsp (XDR *xdrs, gfs3_mknod_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -320,17 +337,18 @@ xdr_gfs3_mknod_rsp (XDR *xdrs, gfs3_mknod_rsp *objp)
 bool_t
 xdr_gfs3_mkdir_req (XDR *xdrs, gfs3_mkdir_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mode))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
-                         (u_int *) &objp->dict.dict_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -338,6 +356,8 @@ xdr_gfs3_mkdir_req (XDR *xdrs, gfs3_mkdir_req *objp)
 bool_t
 xdr_gfs3_mkdir_rsp (XDR *xdrs, gfs3_mkdir_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -355,9 +375,11 @@ xdr_gfs3_mkdir_rsp (XDR *xdrs, gfs3_mkdir_rsp *objp)
 bool_t
 xdr_gfs3_unlink_req (XDR *xdrs, gfs3_unlink_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
@@ -368,6 +390,8 @@ xdr_gfs3_unlink_req (XDR *xdrs, gfs3_unlink_req *objp)
 bool_t
 xdr_gfs3_unlink_rsp (XDR *xdrs, gfs3_unlink_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -383,11 +407,13 @@ xdr_gfs3_unlink_rsp (XDR *xdrs, gfs3_unlink_rsp *objp)
 bool_t
 xdr_gfs3_rmdir_req (XDR *xdrs, gfs3_rmdir_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-                 return FALSE;
-         if (!xdr_int (xdrs, &objp->flags))
-                 return FALSE;
+		 return FALSE;
+	 if (!xdr_int (xdrs, &objp->flags))
+		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
@@ -398,6 +424,8 @@ xdr_gfs3_rmdir_req (XDR *xdrs, gfs3_rmdir_req *objp)
 bool_t
 xdr_gfs3_rmdir_rsp (XDR *xdrs, gfs3_rmdir_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -413,17 +441,18 @@ xdr_gfs3_rmdir_rsp (XDR *xdrs, gfs3_rmdir_rsp *objp)
 bool_t
 xdr_gfs3_symlink_req (XDR *xdrs, gfs3_symlink_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->linkname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
-                         (u_int *) &objp->dict.dict_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -431,6 +460,8 @@ xdr_gfs3_symlink_req (XDR *xdrs, gfs3_symlink_req *objp)
 bool_t
 xdr_gfs3_symlink_rsp (XDR *xdrs, gfs3_symlink_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -448,11 +479,13 @@ xdr_gfs3_symlink_rsp (XDR *xdrs, gfs3_symlink_rsp *objp)
 bool_t
 xdr_gfs3_rename_req (XDR *xdrs, gfs3_rename_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->oldgfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->newgfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->oldpath, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->oldbname, ~0))
@@ -467,6 +500,8 @@ xdr_gfs3_rename_req (XDR *xdrs, gfs3_rename_req *objp)
 bool_t
 xdr_gfs3_rename_rsp (XDR *xdrs, gfs3_rename_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -488,11 +523,13 @@ xdr_gfs3_rename_rsp (XDR *xdrs, gfs3_rename_rsp *objp)
 bool_t
 xdr_gfs3_link_req (XDR *xdrs, gfs3_link_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->oldgfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->newgfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->oldpath, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->newpath, ~0))
@@ -505,6 +542,8 @@ xdr_gfs3_link_req (XDR *xdrs, gfs3_link_req *objp)
 bool_t
 xdr_gfs3_link_rsp (XDR *xdrs, gfs3_link_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -522,6 +561,8 @@ xdr_gfs3_link_rsp (XDR *xdrs, gfs3_link_rsp *objp)
 bool_t
 xdr_gfs3_truncate_req (XDR *xdrs, gfs3_truncate_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -535,6 +576,8 @@ xdr_gfs3_truncate_req (XDR *xdrs, gfs3_truncate_req *objp)
 bool_t
 xdr_gfs3_truncate_rsp (XDR *xdrs, gfs3_truncate_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -550,6 +593,8 @@ xdr_gfs3_truncate_rsp (XDR *xdrs, gfs3_truncate_rsp *objp)
 bool_t
 xdr_gfs3_open_req (XDR *xdrs, gfs3_open_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -565,6 +610,8 @@ xdr_gfs3_open_req (XDR *xdrs, gfs3_open_req *objp)
 bool_t
 xdr_gfs3_open_rsp (XDR *xdrs, gfs3_open_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -578,6 +625,8 @@ xdr_gfs3_open_rsp (XDR *xdrs, gfs3_open_rsp *objp)
 bool_t
 xdr_gfs3_read_req (XDR *xdrs, gfs3_read_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -593,6 +642,8 @@ xdr_gfs3_read_req (XDR *xdrs, gfs3_read_req *objp)
 bool_t
 xdr_gfs3_read_rsp (XDR *xdrs, gfs3_read_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -602,26 +653,26 @@ xdr_gfs3_read_rsp (XDR *xdrs, gfs3_read_rsp *objp)
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->size))
 		 return FALSE;
-
-         return TRUE;
+	return TRUE;
 }
 
 bool_t
 xdr_gfs3_lookup_req (XDR *xdrs, gfs3_lookup_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->path, ~0))
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
-                         (u_int *) &objp->dict.dict_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -629,6 +680,8 @@ xdr_gfs3_lookup_req (XDR *xdrs, gfs3_lookup_req *objp)
 bool_t
 xdr_gfs3_lookup_rsp (XDR *xdrs, gfs3_lookup_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -638,8 +691,7 @@ xdr_gfs3_lookup_rsp (XDR *xdrs, gfs3_lookup_rsp *objp)
 		 return FALSE;
 	 if (!xdr_gf_iatt (xdrs, &objp->postparent))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
-                         (u_int *) &objp->dict.dict_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -647,6 +699,8 @@ xdr_gfs3_lookup_rsp (XDR *xdrs, gfs3_lookup_rsp *objp)
 bool_t
 xdr_gfs3_write_req (XDR *xdrs, gfs3_write_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -662,6 +716,8 @@ xdr_gfs3_write_req (XDR *xdrs, gfs3_write_req *objp)
 bool_t
 xdr_gfs3_write_rsp (XDR *xdrs, gfs3_write_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -677,6 +733,8 @@ xdr_gfs3_write_rsp (XDR *xdrs, gfs3_write_rsp *objp)
 bool_t
 xdr_gfs3_statfs_req (XDR *xdrs, gfs3_statfs_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -688,6 +746,8 @@ xdr_gfs3_statfs_req (XDR *xdrs, gfs3_statfs_req *objp)
 bool_t
 xdr_gfs3_statfs_rsp (XDR *xdrs, gfs3_statfs_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -701,6 +761,8 @@ xdr_gfs3_statfs_rsp (XDR *xdrs, gfs3_statfs_rsp *objp)
 bool_t
 xdr_gfs3_lk_req (XDR *xdrs, gfs3_lk_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -718,6 +780,8 @@ xdr_gfs3_lk_req (XDR *xdrs, gfs3_lk_req *objp)
 bool_t
 xdr_gfs3_lk_rsp (XDR *xdrs, gfs3_lk_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -731,6 +795,8 @@ xdr_gfs3_lk_rsp (XDR *xdrs, gfs3_lk_rsp *objp)
 bool_t
 xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -750,6 +816,8 @@ xdr_gfs3_inodelk_req (XDR *xdrs, gfs3_inodelk_req *objp)
 bool_t
 xdr_gfs3_finodelk_req (XDR *xdrs, gfs3_finodelk_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -769,6 +837,8 @@ xdr_gfs3_finodelk_req (XDR *xdrs, gfs3_finodelk_req *objp)
 bool_t
 xdr_gfs3_flush_req (XDR *xdrs, gfs3_flush_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -780,6 +850,8 @@ xdr_gfs3_flush_req (XDR *xdrs, gfs3_flush_req *objp)
 bool_t
 xdr_gfs3_fsync_req (XDR *xdrs, gfs3_fsync_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -793,6 +865,8 @@ xdr_gfs3_fsync_req (XDR *xdrs, gfs3_fsync_req *objp)
 bool_t
 xdr_gfs3_fsync_rsp (XDR *xdrs, gfs3_fsync_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -808,6 +882,8 @@ xdr_gfs3_fsync_rsp (XDR *xdrs, gfs3_fsync_rsp *objp)
 bool_t
 xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -823,6 +899,8 @@ xdr_gfs3_setxattr_req (XDR *xdrs, gfs3_setxattr_req *objp)
 bool_t
 xdr_gfs3_fsetxattr_req (XDR *xdrs, gfs3_fsetxattr_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -838,6 +916,8 @@ xdr_gfs3_fsetxattr_req (XDR *xdrs, gfs3_fsetxattr_req *objp)
 bool_t
 xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -853,6 +933,8 @@ xdr_gfs3_xattrop_req (XDR *xdrs, gfs3_xattrop_req *objp)
 bool_t
 xdr_gfs3_xattrop_rsp (XDR *xdrs, gfs3_xattrop_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -866,6 +948,8 @@ xdr_gfs3_xattrop_rsp (XDR *xdrs, gfs3_xattrop_rsp *objp)
 bool_t
 xdr_gfs3_fxattrop_req (XDR *xdrs, gfs3_fxattrop_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -881,6 +965,8 @@ xdr_gfs3_fxattrop_req (XDR *xdrs, gfs3_fxattrop_req *objp)
 bool_t
 xdr_gfs3_fxattrop_rsp (XDR *xdrs, gfs3_fxattrop_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -894,6 +980,8 @@ xdr_gfs3_fxattrop_rsp (XDR *xdrs, gfs3_fxattrop_rsp *objp)
 bool_t
 xdr_gfs3_getxattr_req (XDR *xdrs, gfs3_getxattr_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -909,6 +997,8 @@ xdr_gfs3_getxattr_req (XDR *xdrs, gfs3_getxattr_req *objp)
 bool_t
 xdr_gfs3_getxattr_rsp (XDR *xdrs, gfs3_getxattr_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -922,6 +1012,8 @@ xdr_gfs3_getxattr_rsp (XDR *xdrs, gfs3_getxattr_rsp *objp)
 bool_t
 xdr_gfs3_fgetxattr_req (XDR *xdrs, gfs3_fgetxattr_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -937,6 +1029,8 @@ xdr_gfs3_fgetxattr_req (XDR *xdrs, gfs3_fgetxattr_req *objp)
 bool_t
 xdr_gfs3_fgetxattr_rsp (XDR *xdrs, gfs3_fgetxattr_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -950,6 +1044,8 @@ xdr_gfs3_fgetxattr_rsp (XDR *xdrs, gfs3_fgetxattr_rsp *objp)
 bool_t
 xdr_gfs3_removexattr_req (XDR *xdrs, gfs3_removexattr_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -963,6 +1059,8 @@ xdr_gfs3_removexattr_req (XDR *xdrs, gfs3_removexattr_req *objp)
 bool_t
 xdr_gfs3_opendir_req (XDR *xdrs, gfs3_opendir_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -974,6 +1072,8 @@ xdr_gfs3_opendir_req (XDR *xdrs, gfs3_opendir_req *objp)
 bool_t
 xdr_gfs3_opendir_rsp (XDR *xdrs, gfs3_opendir_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -987,6 +1087,8 @@ xdr_gfs3_opendir_rsp (XDR *xdrs, gfs3_opendir_rsp *objp)
 bool_t
 xdr_gfs3_fsyncdir_req (XDR *xdrs, gfs3_fsyncdir_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1000,6 +1102,8 @@ xdr_gfs3_fsyncdir_req (XDR *xdrs, gfs3_fsyncdir_req *objp)
 bool_t
 xdr_gfs3_readdir_req (XDR *xdrs, gfs3_readdir_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1015,6 +1119,8 @@ xdr_gfs3_readdir_req (XDR *xdrs, gfs3_readdir_req *objp)
 bool_t
 xdr_gfs3_readdirp_req (XDR *xdrs, gfs3_readdirp_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1030,6 +1136,8 @@ xdr_gfs3_readdirp_req (XDR *xdrs, gfs3_readdirp_req *objp)
 bool_t
 xdr_gf_setvolume_req (XDR *xdrs, gf_setvolume_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
@@ -1039,6 +1147,8 @@ xdr_gf_setvolume_req (XDR *xdrs, gf_setvolume_req *objp)
 bool_t
 xdr_gf_setvolume_rsp (XDR *xdrs, gf_setvolume_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1052,6 +1162,8 @@ xdr_gf_setvolume_rsp (XDR *xdrs, gf_setvolume_rsp *objp)
 bool_t
 xdr_gfs3_access_req (XDR *xdrs, gfs3_access_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1065,9 +1177,11 @@ xdr_gfs3_access_req (XDR *xdrs, gfs3_access_req *objp)
 bool_t
 xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->pargfid, 16))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->mode))
@@ -1076,8 +1190,7 @@ xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp)
 		 return FALSE;
 	 if (!xdr_string (xdrs, &objp->bname, ~0))
 		 return FALSE;
-	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val,
-                         (u_int *) &objp->dict.dict_len, ~0))
+	 if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0))
 		 return FALSE;
 	return TRUE;
 }
@@ -1085,6 +1198,8 @@ xdr_gfs3_create_req (XDR *xdrs, gfs3_create_req *objp)
 bool_t
 xdr_gfs3_create_rsp (XDR *xdrs, gfs3_create_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1104,6 +1219,8 @@ xdr_gfs3_create_rsp (XDR *xdrs, gfs3_create_rsp *objp)
 bool_t
 xdr_gfs3_ftruncate_req (XDR *xdrs, gfs3_ftruncate_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1117,6 +1234,8 @@ xdr_gfs3_ftruncate_req (XDR *xdrs, gfs3_ftruncate_req *objp)
 bool_t
 xdr_gfs3_ftruncate_rsp (XDR *xdrs, gfs3_ftruncate_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1132,6 +1251,8 @@ xdr_gfs3_ftruncate_rsp (XDR *xdrs, gfs3_ftruncate_rsp *objp)
 bool_t
 xdr_gfs3_fstat_req (XDR *xdrs, gfs3_fstat_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1143,6 +1264,8 @@ xdr_gfs3_fstat_req (XDR *xdrs, gfs3_fstat_req *objp)
 bool_t
 xdr_gfs3_fstat_rsp (XDR *xdrs, gfs3_fstat_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1156,6 +1279,8 @@ xdr_gfs3_fstat_rsp (XDR *xdrs, gfs3_fstat_rsp *objp)
 bool_t
 xdr_gfs3_entrylk_req (XDR *xdrs, gfs3_entrylk_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1177,6 +1302,8 @@ xdr_gfs3_entrylk_req (XDR *xdrs, gfs3_entrylk_req *objp)
 bool_t
 xdr_gfs3_fentrylk_req (XDR *xdrs, gfs3_fentrylk_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1195,10 +1322,11 @@ xdr_gfs3_fentrylk_req (XDR *xdrs, gfs3_fentrylk_req *objp)
 	return TRUE;
 }
 
-
 bool_t
 xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1214,6 +1342,8 @@ xdr_gfs3_setattr_req (XDR *xdrs, gfs3_setattr_req *objp)
 bool_t
 xdr_gfs3_setattr_rsp (XDR *xdrs, gfs3_setattr_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1229,6 +1359,8 @@ xdr_gfs3_setattr_rsp (XDR *xdrs, gfs3_setattr_rsp *objp)
 bool_t
 xdr_gfs3_fsetattr_req (XDR *xdrs, gfs3_fsetattr_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
@@ -1242,6 +1374,8 @@ xdr_gfs3_fsetattr_req (XDR *xdrs, gfs3_fsetattr_req *objp)
 bool_t
 xdr_gfs3_fsetattr_rsp (XDR *xdrs, gfs3_fsetattr_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1257,6 +1391,8 @@ xdr_gfs3_fsetattr_rsp (XDR *xdrs, gfs3_fsetattr_rsp *objp)
 bool_t
 xdr_gfs3_rchecksum_req (XDR *xdrs, gfs3_rchecksum_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_quad_t (xdrs, &objp->fd))
 		 return FALSE;
@@ -1271,6 +1407,7 @@ bool_t
 xdr_gfs3_rchecksum_rsp (XDR *xdrs, gfs3_rchecksum_rsp *objp)
 {
 	register int32_t *buf;
+        buf = NULL;
 
 
 	if (xdrs->x_op == XDR_ENCODE) {
@@ -1325,6 +1462,8 @@ xdr_gfs3_rchecksum_rsp (XDR *xdrs, gfs3_rchecksum_rsp *objp)
 bool_t
 xdr_gf_getspec_req (XDR *xdrs, gf_getspec_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
@@ -1336,6 +1475,8 @@ xdr_gf_getspec_req (XDR *xdrs, gf_getspec_req *objp)
 bool_t
 xdr_gf_getspec_rsp (XDR *xdrs, gf_getspec_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1349,6 +1490,8 @@ xdr_gf_getspec_rsp (XDR *xdrs, gf_getspec_rsp *objp)
 bool_t
 xdr_gf_log_req (XDR *xdrs, gf_log_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_bytes (xdrs, (char **)&objp->msg.msg_val, (u_int *) &objp->msg.msg_len, ~0))
 		 return FALSE;
@@ -1358,6 +1501,8 @@ xdr_gf_log_req (XDR *xdrs, gf_log_req *objp)
 bool_t
 xdr_gf_notify_req (XDR *xdrs, gf_notify_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_u_int (xdrs, &objp->flags))
 		 return FALSE;
@@ -1370,6 +1515,8 @@ bool_t
 xdr_gf_notify_rsp (XDR *xdrs, gf_notify_rsp *objp)
 {
 	register int32_t *buf;
+        buf = NULL;
+
 
 	if (xdrs->x_op == XDR_ENCODE) {
 		buf = XDR_INLINE (xdrs, 3 * BYTES_PER_XDR_UNIT);
@@ -1423,6 +1570,8 @@ xdr_gf_notify_rsp (XDR *xdrs, gf_notify_rsp *objp)
 bool_t
 xdr_gfs3_releasedir_req (XDR *xdrs, gfs3_releasedir_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1434,6 +1583,8 @@ xdr_gfs3_releasedir_req (XDR *xdrs, gfs3_releasedir_req *objp)
 bool_t
 xdr_gfs3_release_req (XDR *xdrs, gfs3_release_req *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_opaque (xdrs, objp->gfid, 16))
 		 return FALSE;
@@ -1445,6 +1596,8 @@ xdr_gfs3_release_req (XDR *xdrs, gfs3_release_req *objp)
 bool_t
 xdr_gf_common_rsp (XDR *xdrs, gf_common_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
 
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
@@ -1453,10 +1606,12 @@ xdr_gf_common_rsp (XDR *xdrs, gf_common_rsp *objp)
 	return TRUE;
 }
 
-
 bool_t
 xdr_gfs3_dirlist (XDR *xdrs, gfs3_dirlist *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
+
 	 if (!xdr_u_quad_t (xdrs, &objp->d_ino))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->d_off))
@@ -1475,6 +1630,9 @@ xdr_gfs3_dirlist (XDR *xdrs, gfs3_dirlist *objp)
 bool_t
 xdr_gfs3_readdir_rsp (XDR *xdrs, gfs3_readdir_rsp *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
+
 	 if (!xdr_int (xdrs, &objp->op_ret))
 		 return FALSE;
 	 if (!xdr_int (xdrs, &objp->op_errno))
@@ -1487,10 +1645,13 @@ xdr_gfs3_readdir_rsp (XDR *xdrs, gfs3_readdir_rsp *objp)
 bool_t
 xdr_gfs3_dirplist (XDR *xdrs, gfs3_dirplist *objp)
 {
+	register int32_t *buf;
+        buf = NULL;
+
 	 if (!xdr_u_quad_t (xdrs, &objp->d_ino))
 		 return FALSE;
 	 if (!xdr_u_quad_t (xdrs, &objp->d_off))
-                 return FALSE;
+		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->d_len))
 		 return FALSE;
 	 if (!xdr_u_int (xdrs, &objp->d_type))
@@ -1507,11 +1668,14 @@ xdr_gfs3_dirplist (XDR *xdrs, gfs3_dirplist *objp)
 bool_t
 xdr_gfs3_readdirp_rsp (XDR *xdrs, gfs3_readdirp_rsp *objp)
 {
+	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_pointer (xdrs, (char **)&objp->reply, sizeof (struct gfs3_dirplist), (xdrproc_t) xdr_gfs3_dirplist))
+	 if (!xdr_pointer (xdrs, (char **)&objp->reply, sizeof (gfs3_dirplist), (xdrproc_t) xdr_gfs3_dirplist))
 		 return FALSE;
 	return TRUE;
 }