diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /net/sunrpc/pmap_clnt.c | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'net/sunrpc/pmap_clnt.c')
| -rw-r--r-- | net/sunrpc/pmap_clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/pmap_clnt.c b/net/sunrpc/pmap_clnt.c index 12ab4ec5fc79..d9f765344589 100644 --- a/net/sunrpc/pmap_clnt.c +++ b/net/sunrpc/pmap_clnt.c | |||
| @@ -333,7 +333,7 @@ static int xdr_decode_bool(struct rpc_rqst *req, __be32 *p, unsigned int *boolp) | |||
| 333 | static struct rpc_procinfo pmap_procedures[] = { | 333 | static struct rpc_procinfo pmap_procedures[] = { |
| 334 | [PMAP_SET] = { | 334 | [PMAP_SET] = { |
| 335 | .p_proc = PMAP_SET, | 335 | .p_proc = PMAP_SET, |
| 336 | .p_encode = (kxdrproc_t) xdr_encode_mapping, | 336 | .p_encode = (kxdrproc_t) xdr_encode_mapping, |
| 337 | .p_decode = (kxdrproc_t) xdr_decode_bool, | 337 | .p_decode = (kxdrproc_t) xdr_decode_bool, |
| 338 | .p_bufsiz = 4, | 338 | .p_bufsiz = 4, |
| 339 | .p_count = 1, | 339 | .p_count = 1, |
| @@ -342,7 +342,7 @@ static struct rpc_procinfo pmap_procedures[] = { | |||
| 342 | }, | 342 | }, |
| 343 | [PMAP_UNSET] = { | 343 | [PMAP_UNSET] = { |
| 344 | .p_proc = PMAP_UNSET, | 344 | .p_proc = PMAP_UNSET, |
| 345 | .p_encode = (kxdrproc_t) xdr_encode_mapping, | 345 | .p_encode = (kxdrproc_t) xdr_encode_mapping, |
| 346 | .p_decode = (kxdrproc_t) xdr_decode_bool, | 346 | .p_decode = (kxdrproc_t) xdr_decode_bool, |
| 347 | .p_bufsiz = 4, | 347 | .p_bufsiz = 4, |
| 348 | .p_count = 1, | 348 | .p_count = 1, |