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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
net
/
sunrpc
/
auth_gss
/
auth_gss.c
diff --git
a/net/sunrpc/auth_gss/auth_gss.c
b/net/sunrpc/auth_gss/auth_gss.c
index
e32f2a7
..
60bca99
100644
(file)
--- a/
net/sunrpc/auth_gss/auth_gss.c
+++ b/
net/sunrpc/auth_gss/auth_gss.c
@@
-417,7
+417,7
@@
out_sleep:
static ssize_t
gss_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg,
static ssize_t
gss_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg,
- char
__user
*dst, size_t buflen)
+ char *dst, size_t buflen)
{
char *data = (char *)msg->data + msg->copied;
ssize_t mlen = msg->len;
{
char *data = (char *)msg->data + msg->copied;
ssize_t mlen = msg->len;
@@
-439,7
+439,7
@@
gss_pipe_upcall(struct file *filp, struct rpc_pipe_msg *msg,
#define MSG_BUF_MAXSIZE 1024
static ssize_t
#define MSG_BUF_MAXSIZE 1024
static ssize_t
-gss_pipe_downcall(struct file *filp, const char
__user
*src, size_t mlen)
+gss_pipe_downcall(struct file *filp, const char *src, size_t mlen)
{
struct xdr_netobj obj = {
.len = mlen,
{
struct xdr_netobj obj = {
.len = mlen,
@@
-697,7
+697,7
@@
gss_marshal(struct rpc_task *task, u32 *p, int ruid)
struct rpc_rqst *req = task->tk_rqstp;
u32 maj_stat = 0;
struct xdr_netobj mic;
struct rpc_rqst *req = task->tk_rqstp;
u32 maj_stat = 0;
struct xdr_netobj mic;
- struct
kvec
iov;
+ struct
iovec
iov;
struct xdr_buf verf_buf;
u32 service;
struct xdr_buf verf_buf;
u32 service;
@@
-774,7
+774,7
@@
gss_validate(struct rpc_task *task, u32 *p)
gc_base);
struct gss_cl_ctx *ctx = gss_cred_get_ctx(cred);
u32 seq, qop_state;
gc_base);
struct gss_cl_ctx *ctx = gss_cred_get_ctx(cred);
u32 seq, qop_state;
- struct
kvec
iov;
+ struct
iovec
iov;
struct xdr_buf verf_buf;
struct xdr_netobj mic;
u32 flav,len;
struct xdr_buf verf_buf;
struct xdr_netobj mic;
u32 flav,len;
@@
-830,7
+830,7
@@
gss_wrap_req_integ(struct gss_cl_ctx *ctx,
u32 *integ_len = NULL;
struct xdr_netobj mic;
u32 offset, *q;
u32 *integ_len = NULL;
struct xdr_netobj mic;
u32 offset, *q;
- struct
kvec
*iov;
+ struct
iovec
*iov;
u32 maj_stat = 0;
int status = -EIO;
u32 maj_stat = 0;
int status = -EIO;