nfs41: Backchannel: update cb_sequence args and results

Change the type of cs_addr and csr_status to 'struct sockaddr' and
'__be32' since the cb_sequence processing function will use existing
functionality that expects these types.

Signed-off-by: Ricardo Labiaga <Ricardo.Labiaga@netapp.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>

diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index 576f51f4dc528347bd4b113756d59db08015f869..07baa8254ca1407a6342e80bc3e545c34868161e 100644 (file)
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -84,7 +84,7 @@ struct referring_call_list {
 };
 
 struct cb_sequenceargs {
-       struct sockaddr_in              *csa_addr;
+       struct sockaddr                 *csa_addr;
        struct nfs4_sessionid           csa_sessionid;
        uint32_t                        csa_sequenceid;
        uint32_t                        csa_slotid;
@@ -95,7 +95,7 @@ struct cb_sequenceargs {
 };
 
 struct cb_sequenceres {
-       uint32_t                        csr_status;
+       __be32                          csr_status;
        struct nfs4_sessionid           csr_sessionid;
        uint32_t                        csr_sequenceid;
        uint32_t                        csr_slotid;

diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index 537f21da6e5f1fa9e4ed258a5bc642f3b825e0d3..e5a2dac5f715fe3a98c8c42a6059a29e3914dba3 100644 (file)
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -283,7 +283,7 @@ static unsigned decode_cb_sequence_args(struct svc_rqst *rqstp,
        if (unlikely(p == NULL))
                goto out;
 
-       args->csa_addr = svc_addr_in(rqstp);
+       args->csa_addr = svc_addr(rqstp);
        args->csa_sequenceid = ntohl(*p++);
        args->csa_slotid = ntohl(*p++);
        args->csa_highestslotid = ntohl(*p++);