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, 13 insertions, 15 deletions

diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 77e3f5413a1..971cd08b074 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -44,10 +44,10 @@ int client_destroy_rpc (xlator_t *this);
 int
 client_submit_request (xlator_t *this, void *req, call_frame_t *frame,
                        rpc_clnt_prog_t *prog, int procnum, fop_cbk_fn_t cbk,
-                       struct iobref *iobref, gfs_serialize_t sfunc,
-                       struct iovec *rsphdr, int rsphdr_count,
-                       struct iovec *rsp_payload, int rsp_payload_count,
-                       struct iobref *rsp_iobref, xdrproc_t xdrproc)
+                       struct iobref *iobref,  struct iovec *rsphdr,
+                       int rsphdr_count, struct iovec *rsp_payload,
+                       int rsp_payload_count, struct iobref *rsp_iobref,
+                       xdrproc_t xdrproc)
 {
         int            ret         = -1;
         clnt_conf_t   *conf        = NULL;
@@ -111,18 +111,16 @@ client_submit_request (xlator_t *this, void *req, call_frame_t *frame,
                 iov.iov_len  = iobuf_size (iobuf);
 
                 /* Create the xdr payload */
-                if (sfunc) {
-                        ret = sfunc (iov, req);
-                        if (ret == -1) {
-                                /* callingfn so that, we can get to know which xdr
-                                   function was called */
-                                gf_log_callingfn (this->name, GF_LOG_WARNING,
-                                                  "XDR payload creation failed");
-                                goto out;
-                        }
-                        iov.iov_len = ret;
-                        count = 1;
+                ret = xdr_serialize_generic (iov, req, xdrproc);
+                if (ret == -1) {
+                        /* callingfn so that, we can get to know which xdr
+                           function was called */
+                        gf_log_callingfn (this->name, GF_LOG_WARNING,
+                                          "XDR payload creation failed");
+                        goto out;
                 }
+                iov.iov_len = ret;
+                count = 1;
         }
 
         /* Send the msg */