diff options
author | Alexander Viro <viro@www.linux.org.uk> | 2004-07-15 22:05:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-15 22:05:10 -0700 |
commit | b145333f8f6d2513baf9ffcd52552db7ecb7f97d (patch) | |
tree | e7e6e3fa751638c7bca93f9f117cb98af5484f19 /net | |
parent | 8af0afb24eaf9df5aa5a2ea720c3613431f04ad5 (diff) | |
download | history-b145333f8f6d2513baf9ffcd52552db7ecb7f97d.tar.gz |
[PATCH] sparse: iovec cleanups - sunrpc, nfs and nfsd
sunrpc, nfs and nfsd switched to use of kvec and kernel_...msg()
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 10 | ||||
-rw-r--r-- | net/sunrpc/auth_gss/svcauth_gss.c | 16 | ||||
-rw-r--r-- | net/sunrpc/svc.c | 4 | ||||
-rw-r--r-- | net/sunrpc/svcauth_unix.c | 8 | ||||
-rw-r--r-- | net/sunrpc/svcsock.c | 17 | ||||
-rw-r--r-- | net/sunrpc/xdr.c | 70 |
6 files changed, 56 insertions, 69 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 60bca99bf98f81..e32f2a709e2d87 100644 --- 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, - char *dst, size_t buflen) + char __user *dst, size_t buflen) { 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 -gss_pipe_downcall(struct file *filp, const char *src, size_t mlen) +gss_pipe_downcall(struct file *filp, const char __user *src, size_t 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 iovec iov; + struct kvec iov; 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; - struct iovec iov; + struct kvec iov; 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; - struct iovec *iov; + struct kvec *iov; u32 maj_stat = 0; int status = -EIO; diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 8cb95cab79ddfa..5822ab211707f6 100644 --- 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 -svc_safe_getnetobj(struct iovec *argv, struct xdr_netobj *o) +svc_safe_getnetobj(struct kvec *argv, struct xdr_netobj *o) { int l; @@ -520,7 +520,7 @@ svc_safe_getnetobj(struct iovec *argv, struct xdr_netobj *o) } static inline int -svc_safe_putnetobj(struct iovec *resv, struct xdr_netobj *o) +svc_safe_putnetobj(struct kvec *resv, struct xdr_netobj *o) { 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 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; @@ -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 iovec iov; + struct kvec iov; 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) { - 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; @@ -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 iovec *resv; + struct kvec *resv; u32 *p; int integ_offset, integ_len; int stat = -EINVAL; diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 14c561ddac3a5e..db65a24a165887 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -257,8 +257,8 @@ svc_process(struct svc_serv *serv, struct svc_rqst *rqstp) struct svc_program *progp; struct svc_version *versp = NULL; /* compiler food */ struct svc_procedure *procp = NULL; - 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]; kxdrproc_t xdr; u32 *statp; u32 dir, prog, vers, proc, diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c index ab5164b6dab334..6d98c3bc6041ad 100644 --- a/net/sunrpc/svcauth_unix.c +++ b/net/sunrpc/svcauth_unix.c @@ -338,8 +338,8 @@ void svcauth_unix_purge(void) static int svcauth_null_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]; int rv=0; struct ip_map key, *ipm; @@ -422,8 +422,8 @@ struct auth_ops svcauth_null = { int svcauth_unix_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]; struct svc_cred *cred = &rqstp->rq_cred; u32 slen, i; int len = argv->iov_len; diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index ad353ae90634c6..d2d8e9b006c892 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -450,9 +450,8 @@ svc_recv_available(struct svc_sock *svsk) * Generic recvfrom routine. */ static int -svc_recvfrom(struct svc_rqst *rqstp, struct iovec *iov, int nr, int buflen) +svc_recvfrom(struct svc_rqst *rqstp, struct kvec *iov, int nr, int buflen) { - mm_segment_t oldfs; struct msghdr msg; struct socket *sock; int len, alen; @@ -462,16 +461,12 @@ svc_recvfrom(struct svc_rqst *rqstp, struct iovec *iov, int nr, int buflen) msg.msg_name = &rqstp->rq_addr; msg.msg_namelen = sizeof(rqstp->rq_addr); - msg.msg_iov = iov; - msg.msg_iovlen = nr; msg.msg_control = NULL; msg.msg_controllen = 0; msg.msg_flags = MSG_DONTWAIT; - oldfs = get_fs(); set_fs(KERNEL_DS); - len = sock_recvmsg(sock, &msg, buflen, MSG_DONTWAIT); - set_fs(oldfs); + len = kernel_recvmsg(sock, &msg, iov, nr, buflen, MSG_DONTWAIT); /* sock_recvmsg doesn't fill in the name/namelen, so we must.. * possibly we should cache this in the svc_sock structure @@ -898,7 +893,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) struct svc_sock *svsk = rqstp->rq_sock; struct svc_serv *serv = svsk->sk_server; int len; - struct iovec vec[RPCSVC_MAXPAGES]; + struct kvec vec[RPCSVC_MAXPAGES]; int pnum, vlen; dprintk("svc: tcp_recv %p data %d conn %d close %d\n", @@ -942,7 +937,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp) */ if (svsk->sk_tcplen < 4) { unsigned long want = 4 - svsk->sk_tcplen; - struct iovec iov; + struct kvec iov; iov.iov_base = ((char *) &svsk->sk_reclen) + svsk->sk_tcplen; iov.iov_len = want; @@ -1056,8 +1051,8 @@ svc_tcp_sendto(struct svc_rqst *rqstp) int sent; u32 reclen; - /* Set up the first element of the reply iovec. - * Any other iovecs that may be in use have been taken + /* Set up the first element of the reply kvec. + * Any other kvecs that may be in use have been taken * care of by the server implementation itself. */ reclen = htonl(0x80000000|((xbufp->len ) - 4)); diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index c7d8bb459c9a27..a6630a1f2025e3 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -141,7 +141,7 @@ void xdr_encode_pages(struct xdr_buf *xdr, struct page **pages, unsigned int base, unsigned int len) { - struct iovec *tail = xdr->tail; + struct kvec *tail = xdr->tail; u32 *p; xdr->pages = pages; @@ -168,8 +168,8 @@ void xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset, struct page **pages, unsigned int base, unsigned int len) { - struct iovec *head = xdr->head; - struct iovec *tail = xdr->tail; + struct kvec *head = xdr->head; + struct kvec *tail = xdr->tail; char *buf = (char *)head->iov_base; unsigned int buflen = head->iov_len; @@ -186,19 +186,19 @@ xdr_inline_pages(struct xdr_buf *xdr, unsigned int offset, } /* - * Realign the iovec if the server missed out some reply elements + * Realign the kvec if the server missed out some reply elements * (such as post-op attributes,...) * Note: This is a simple implementation that assumes that * len <= iov->iov_len !!! * The RPC header (assumed to be the 1st element in the iov array) * is not shifted. */ -void xdr_shift_iovec(struct iovec *iov, int nr, size_t len) +void xdr_shift_iovec(struct kvec *iov, int nr, size_t len) { - struct iovec *pvec; + struct kvec *pvec; for (pvec = iov + nr - 1; nr > 1; nr--, pvec--) { - struct iovec *svec = pvec - 1; + struct kvec *svec = pvec - 1; if (len > pvec->iov_len) { printk(KERN_DEBUG "RPC: Urk! Large shift of short iovec.\n"); @@ -217,11 +217,11 @@ void xdr_shift_iovec(struct iovec *iov, int nr, size_t len) } /* - * Map a struct xdr_buf into an iovec array. + * Map a struct xdr_buf into an kvec array. */ -int xdr_kmap(struct iovec *iov_base, struct xdr_buf *xdr, size_t base) +int xdr_kmap(struct kvec *iov_base, struct xdr_buf *xdr, size_t base) { - struct iovec *iov = iov_base; + struct kvec *iov = iov_base; struct page **ppage = xdr->pages; unsigned int len, pglen = xdr->page_len; @@ -371,11 +371,10 @@ xdr_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen, unsigned int len, pglen = xdr->page_len; int err, ret = 0; ssize_t (*sendpage)(struct socket *, struct page *, int, size_t, int); - mm_segment_t oldfs; len = xdr->head[0].iov_len; if (base < len || (addr != NULL && base == 0)) { - struct iovec iov = { + struct kvec iov = { .iov_base = xdr->head[0].iov_base + base, .iov_len = len - base, }; @@ -384,16 +383,13 @@ xdr_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen, .msg_namelen = addrlen, .msg_flags = msgflags, }; - - if (iov.iov_len != 0) { - msg.msg_iov = &iov; - msg.msg_iovlen = 1; - } if (xdr->len > len) msg.msg_flags |= MSG_MORE; - oldfs = get_fs(); set_fs(get_ds()); - err = sock_sendmsg(sock, &msg, iov.iov_len); - set_fs(oldfs); + + if (iov.iov_len != 0) + err = kernel_sendmsg(sock, &msg, &iov, 1, iov.iov_len); + else + err = kernel_sendmsg(sock, &msg, NULL, 0, 0); if (ret == 0) ret = err; else if (err > 0) @@ -446,18 +442,14 @@ xdr_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen, copy_tail: len = xdr->tail[0].iov_len; if (base < len) { - struct iovec iov = { + struct kvec iov = { .iov_base = xdr->tail[0].iov_base + base, .iov_len = len - base, }; struct msghdr msg = { - .msg_iov = &iov, - .msg_iovlen = 1, .msg_flags = msgflags, }; - oldfs = get_fs(); set_fs(get_ds()); - err = sock_sendmsg(sock, &msg, iov.iov_len); - set_fs(oldfs); + err = kernel_sendmsg(sock, &msg, &iov, 1, iov.iov_len); if (ret == 0) ret = err; else if (err > 0) @@ -614,14 +606,14 @@ _copy_from_pages(char *p, struct page **pages, size_t pgbase, size_t len) * @buf: xdr_buf * @len: bytes to remove from buf->head[0] * - * Shrinks XDR buffer's header iovec buf->head[0] by + * Shrinks XDR buffer's header kvec buf->head[0] by * 'len' bytes. The extra data is not lost, but is instead * moved into the inlined pages and/or the tail. */ void xdr_shrink_bufhead(struct xdr_buf *buf, size_t len) { - struct iovec *head, *tail; + struct kvec *head, *tail; size_t copy, offs; unsigned int pglen = buf->page_len; @@ -694,7 +686,7 @@ xdr_shrink_bufhead(struct xdr_buf *buf, size_t len) void xdr_shrink_pagelen(struct xdr_buf *buf, size_t len) { - struct iovec *tail; + struct kvec *tail; size_t copy; char *p; unsigned int pglen = buf->page_len; @@ -738,15 +730,15 @@ xdr_shift_buf(struct xdr_buf *buf, size_t len) * @p: current pointer inside XDR buffer * * Note: at the moment the RPC client only passes the length of our - * scratch buffer in the xdr_buf's header iovec. Previously this + * scratch buffer in the xdr_buf's header kvec. Previously this * meant we needed to call xdr_adjust_iovec() after encoding the * data. With the new scheme, the xdr_stream manages the details - * of the buffer length, and takes care of adjusting the iovec + * of the buffer length, and takes care of adjusting the kvec * length for us. */ void xdr_init_encode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p) { - struct iovec *iov = buf->head; + struct kvec *iov = buf->head; xdr->buf = buf; xdr->iov = iov; @@ -763,7 +755,7 @@ EXPORT_SYMBOL(xdr_init_encode); * * Checks that we have enough buffer space to encode 'nbytes' more * bytes of data. If so, update the total xdr_buf length, and - * adjust the length of the current iovec. + * adjust the length of the current kvec. */ uint32_t * xdr_reserve_space(struct xdr_stream *xdr, size_t nbytes) { @@ -795,7 +787,7 @@ void xdr_write_pages(struct xdr_stream *xdr, struct page **pages, unsigned int b unsigned int len) { struct xdr_buf *buf = xdr->buf; - struct iovec *iov = buf->tail; + struct kvec *iov = buf->tail; buf->pages = pages; buf->page_base = base; buf->page_len = len; @@ -826,7 +818,7 @@ EXPORT_SYMBOL(xdr_write_pages); */ void xdr_init_decode(struct xdr_stream *xdr, struct xdr_buf *buf, uint32_t *p) { - struct iovec *iov = buf->head; + struct kvec *iov = buf->head; unsigned int len = iov->iov_len; if (len > buf->len) @@ -873,7 +865,7 @@ EXPORT_SYMBOL(xdr_inline_decode); void xdr_read_pages(struct xdr_stream *xdr, unsigned int len) { struct xdr_buf *buf = xdr->buf; - struct iovec *iov; + struct kvec *iov; ssize_t shift; unsigned int end; int padding; @@ -905,10 +897,10 @@ void xdr_read_pages(struct xdr_stream *xdr, unsigned int len) } EXPORT_SYMBOL(xdr_read_pages); -static struct iovec empty_iov = {.iov_base = NULL, .iov_len = 0}; +static struct kvec empty_iov = {.iov_base = NULL, .iov_len = 0}; void -xdr_buf_from_iov(struct iovec *iov, struct xdr_buf *buf) +xdr_buf_from_iov(struct kvec *iov, struct xdr_buf *buf) { buf->head[0] = *iov; buf->tail[0] = empty_iov; @@ -921,7 +913,7 @@ xdr_buf_from_iov(struct iovec *iov, struct xdr_buf *buf) * length of subiov to zero. Decrements len by length of subiov, sets base * to zero (or decrements it by length of iov if subiov is empty). */ static void -iov_subsegment(struct iovec *iov, struct iovec *subiov, int *base, int *len) +iov_subsegment(struct kvec *iov, struct kvec *subiov, int *base, int *len) { if (*base > iov->iov_len) { subiov->iov_base = NULL; |