summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Labiaga <Ricardo.Labiaga@netapp.com>2009-04-01 09:23:30 -0400
committerBenny Halevy <bhalevy@panasas.com>2009-06-17 14:11:40 -0700
commit65fc64e547c794764a441e16e95bb76c0e256bd7 (patch)
treefef3f27b7f8559026bd9dcb2d3c02dd4816fdb43
parentdd2b63d049480979016b959abc2d141cdddb1389 (diff)
downloadlinux-3.10-65fc64e547c794764a441e16e95bb76c0e256bd7.tar.gz
linux-3.10-65fc64e547c794764a441e16e95bb76c0e256bd7.tar.bz2
linux-3.10-65fc64e547c794764a441e16e95bb76c0e256bd7.zip
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>
-rw-r--r--fs/nfs/callback.h4
-rw-r--r--fs/nfs/callback_xdr.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index 576f51f4dc5..07baa8254ca 100644
--- 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 537f21da6e5..e5a2dac5f71 100644
--- 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++);