git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
net
/
sunrpc
/
auth_gss
/
svcauth_gss.c
diff --git
a/net/sunrpc/auth_gss/svcauth_gss.c
b/net/sunrpc/auth_gss/svcauth_gss.c
index
55b2fd1
..
5822ab2
100644
(file)
--- a/
net/sunrpc/auth_gss/svcauth_gss.c
+++ b/
net/sunrpc/auth_gss/svcauth_gss.c
@@
-503,7
+503,7
@@
static inline u32 round_up_to_quad(u32 i)
}
static inline int
}
static inline int
-svc_safe_getnetobj(struct
io
vec *argv, struct xdr_netobj *o)
+svc_safe_getnetobj(struct
k
vec *argv, struct xdr_netobj *o)
{
int l;
{
int l;
@@
-520,7
+520,7
@@
svc_safe_getnetobj(struct iovec *argv, struct xdr_netobj *o)
}
static inline int
}
static inline int
-svc_safe_putnetobj(struct
io
vec *resv, struct xdr_netobj *o)
+svc_safe_putnetobj(struct
k
vec *resv, struct xdr_netobj *o)
{
u32 *p;
{
u32 *p;
@@
-548,8
+548,8
@@
gss_verify_header(struct svc_rqst *rqstp, struct rsc *rsci,
struct xdr_buf rpchdr;
struct xdr_netobj checksum;
u32 flavor = 0;
struct xdr_buf rpchdr;
struct xdr_netobj checksum;
u32 flavor = 0;
- struct
iovec
*argv = &rqstp->rq_arg.head[0];
- struct
iovec
iov;
+ struct
kvec
*argv = &rqstp->rq_arg.head[0];
+ struct
kvec
iov;
/* data to compute the checksum over: */
iov.iov_base = rpcstart;
/* data to compute the checksum over: */
iov.iov_base = rpcstart;
@@
-595,7
+595,7
@@
gss_write_verf(struct svc_rqst *rqstp, struct gss_ctx *ctx_id, u32 seq)
struct xdr_buf verf_data;
struct xdr_netobj mic;
u32 *p;
struct xdr_buf verf_data;
struct xdr_netobj mic;
u32 *p;
- struct
iovec
iov;
+ struct
kvec
iov;
svc_putu32(rqstp->rq_res.head, htonl(RPC_AUTH_GSS));
xdr_seq = htonl(seq);
svc_putu32(rqstp->rq_res.head, htonl(RPC_AUTH_GSS));
xdr_seq = htonl(seq);
@@
-743,8
+743,8
@@
struct gss_svc_data {
static int
svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp)
{
static int
svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp)
{
- struct
iovec
*argv = &rqstp->rq_arg.head[0];
- struct
iovec
*resv = &rqstp->rq_res.head[0];
+ struct
kvec
*argv = &rqstp->rq_arg.head[0];
+ struct
kvec
*resv = &rqstp->rq_res.head[0];
u32 crlen;
struct xdr_netobj tmpobj;
struct gss_svc_data *svcdata = rqstp->rq_auth_data;
u32 crlen;
struct xdr_netobj tmpobj;
struct gss_svc_data *svcdata = rqstp->rq_auth_data;
@@
-763,7
+763,7
@@
svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp)
if (!svcdata)
goto auth_err;
rqstp->rq_auth_data = svcdata;
if (!svcdata)
goto auth_err;
rqstp->rq_auth_data = svcdata;
- svcdata->body_start =
0
;
+ svcdata->body_start =
NULL
;
svcdata->rsci = NULL;
gc = &svcdata->clcred;
svcdata->rsci = NULL;
gc = &svcdata->clcred;
@@
-952,7
+952,7
@@
svcauth_gss_release(struct svc_rqst *rqstp)
struct xdr_buf *resbuf = &rqstp->rq_res;
struct xdr_buf integ_buf;
struct xdr_netobj mic;
struct xdr_buf *resbuf = &rqstp->rq_res;
struct xdr_buf integ_buf;
struct xdr_netobj mic;
- struct
io
vec *resv;
+ struct
k
vec *resv;
u32 *p;
int integ_offset, integ_len;
int stat = -EINVAL;
u32 *p;
int integ_offset, integ_len;
int stat = -EINVAL;
@@
-970,7
+970,7
@@
svcauth_gss_release(struct svc_rqst *rqstp)
break;
case RPC_GSS_SVC_INTEGRITY:
p = gsd->body_start;
break;
case RPC_GSS_SVC_INTEGRITY:
p = gsd->body_start;
- gsd->body_start =
0
;
+ gsd->body_start =
NULL
;
/* move accept_stat to right place: */
memcpy(p, p + 2, 4);
/* don't wrap in failure case: */
/* move accept_stat to right place: */
memcpy(p, p + 2, 4);
/* don't wrap in failure case: */