X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fsunrpc%2Fsvc.h;h=980f2a4e4899d10a19bb073ddd2f474cbcbbc185;hb=902d44426afe46356253fe93d8cef2b4d9f236f3;hp=7abde582f9db85aaced04d975cfb81f5e1e02cbe;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 7abde582f..980f2a4e4 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -67,7 +67,7 @@ struct svc_serv { * read responses (that have a header, and some data pages, and possibly * a tail) and means we can share some client side routines. * - * The xdr_buf.head kvec always points to the first page in the rq_*pages + * The xdr_buf.head iovec always points to the first page in the rq_*pages * list. The xdr_buf.pages pointer points to the second page on that * list. xdr_buf.tail points to the end of the first page. * This assumes that the non-page part of an rpc reply will fit @@ -78,7 +78,7 @@ struct svc_serv { */ #define RPCSVC_MAXPAGES ((RPCSVC_MAXPAYLOAD+PAGE_SIZE-1)/PAGE_SIZE + 2) -static inline u32 svc_getu32(struct kvec *iov) +static inline u32 svc_getu32(struct iovec *iov) { u32 val, *vp; vp = iov->iov_base; @@ -87,7 +87,7 @@ static inline u32 svc_getu32(struct kvec *iov) iov->iov_len -= sizeof(u32); return val; } -static inline void svc_putu32(struct kvec *iov, u32 val) +static inline void svc_putu32(struct iovec *iov, u32 val) { u32 *vp = iov->iov_base + iov->iov_len; *vp = val; @@ -162,14 +162,14 @@ static inline int xdr_argsize_check(struct svc_rqst *rqstp, u32 *p) { char *cp = (char *)p; - struct kvec *vec = &rqstp->rq_arg.head[0]; + struct iovec *vec = &rqstp->rq_arg.head[0]; return cp - (char*)vec->iov_base <= vec->iov_len; } static inline int xdr_ressize_check(struct svc_rqst *rqstp, u32 *p) { - struct kvec *vec = &rqstp->rq_res.head[0]; + struct iovec *vec = &rqstp->rq_res.head[0]; char *cp = (char*)p; vec->iov_len = cp - (char*)vec->iov_base;