diff options
author | Ricardo Labiaga <Ricardo.Labiaga@netapp.com> | 2009-04-01 09:23:30 -0400 |
---|---|---|
committer | Benny Halevy <bhalevy@panasas.com> | 2009-06-17 17:11:40 -0400 |
commit | 65fc64e547c794764a441e16e95bb76c0e256bd7 (patch) | |
tree | fef3f27b7f8559026bd9dcb2d3c02dd4816fdb43 /fs | |
parent | dd2b63d049480979016b959abc2d141cdddb1389 (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/callback.h | 4 | ||||
-rw-r--r-- | fs/nfs/callback_xdr.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h index 576f51f4dc52..07baa8254ca1 100644 --- a/fs/nfs/callback.h +++ b/fs/nfs/callback.h | |||
@@ -84,7 +84,7 @@ struct referring_call_list { | |||
84 | }; | 84 | }; |
85 | 85 | ||
86 | struct cb_sequenceargs { | 86 | struct cb_sequenceargs { |
87 | struct sockaddr_in *csa_addr; | 87 | struct sockaddr *csa_addr; |
88 | struct nfs4_sessionid csa_sessionid; | 88 | struct nfs4_sessionid csa_sessionid; |
89 | uint32_t csa_sequenceid; | 89 | uint32_t csa_sequenceid; |
90 | uint32_t csa_slotid; | 90 | uint32_t csa_slotid; |
@@ -95,7 +95,7 @@ struct cb_sequenceargs { | |||
95 | }; | 95 | }; |
96 | 96 | ||
97 | struct cb_sequenceres { | 97 | struct cb_sequenceres { |
98 | uint32_t csr_status; | 98 | __be32 csr_status; |
99 | struct nfs4_sessionid csr_sessionid; | 99 | struct nfs4_sessionid csr_sessionid; |
100 | uint32_t csr_sequenceid; | 100 | uint32_t csr_sequenceid; |
101 | uint32_t csr_slotid; | 101 | uint32_t csr_slotid; |
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index 537f21da6e5f..e5a2dac5f715 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, | |||
283 | if (unlikely(p == NULL)) | 283 | if (unlikely(p == NULL)) |
284 | goto out; | 284 | goto out; |
285 | 285 | ||
286 | args->csa_addr = svc_addr_in(rqstp); | 286 | args->csa_addr = svc_addr(rqstp); |
287 | args->csa_sequenceid = ntohl(*p++); | 287 | args->csa_sequenceid = ntohl(*p++); |
288 | args->csa_slotid = ntohl(*p++); | 288 | args->csa_slotid = ntohl(*p++); |
289 | args->csa_highestslotid = ntohl(*p++); | 289 | args->csa_highestslotid = ntohl(*p++); |