lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SUNRPC: Add __(read|write)_bytes_from_xdr_buf

Browse Source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust
2006-10-17 13:47:24 -04:00
parent 1e78957e0a
commit 4e3e43ad14
1 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
net/sunrpc/xdr.c
View File

@@ -688,56 +688,64 @@ xdr_buf_subsegment(struct xdr_buf *buf, struct xdr_buf *subbuf,
return 0; return 0;
} }
/* obj is assumed to point to allocated memory of size at least len: */ static void __read_bytes_from_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len)
int
read_bytes_from_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, unsigned int len)
{ {
struct xdr_buf subbuf;
unsigned int this_len; unsigned int this_len;
int status;
status = xdr_buf_subsegment(buf, &subbuf, base, len); this_len = min_t(unsigned int, len, subbuf->head[0].iov_len);
if (status) memcpy(obj, subbuf->head[0].iov_base, this_len);
goto out;
this_len = min_t(unsigned int, len, subbuf.head[0].iov_len);
memcpy(obj, subbuf.head[0].iov_base, this_len);
len -= this_len; len -= this_len;
obj += this_len; obj += this_len;
this_len = min_t(unsigned int, len, subbuf.page_len); this_len = min_t(unsigned int, len, subbuf->page_len);
if (this_len) if (this_len)
_copy_from_pages(obj, subbuf.pages, subbuf.page_base, this_len); _copy_from_pages(obj, subbuf->pages, subbuf->page_base, this_len);
len -= this_len; len -= this_len;
obj += this_len; obj += this_len;
this_len = min_t(unsigned int, len, subbuf.tail[0].iov_len); this_len = min_t(unsigned int, len, subbuf->tail[0].iov_len);
memcpy(obj, subbuf.tail[0].iov_base, this_len); memcpy(obj, subbuf->tail[0].iov_base, this_len);
out:
return status;
} }
/* obj is assumed to point to allocated memory of size at least len: */ /* obj is assumed to point to allocated memory of size at least len: */
int int read_bytes_from_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, unsigned int len)
write_bytes_to_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, unsigned int len)
{ {
struct xdr_buf subbuf; struct xdr_buf subbuf;
unsigned int this_len;
int status; int status;
status = xdr_buf_subsegment(buf, &subbuf, base, len); status = xdr_buf_subsegment(buf, &subbuf, base, len);
if (status) if (status != 0)
goto out; return status;
this_len = min_t(unsigned int, len, subbuf.head[0].iov_len); __read_bytes_from_xdr_buf(&subbuf, obj, len);
memcpy(subbuf.head[0].iov_base, obj, this_len); return 0;
}
static void __write_bytes_to_xdr_buf(struct xdr_buf *subbuf, void *obj, unsigned int len)
{
unsigned int this_len;
this_len = min_t(unsigned int, len, subbuf->head[0].iov_len);
memcpy(subbuf->head[0].iov_base, obj, this_len);
len -= this_len; len -= this_len;
obj += this_len; obj += this_len;
this_len = min_t(unsigned int, len, subbuf.page_len); this_len = min_t(unsigned int, len, subbuf->page_len);
if (this_len) if (this_len)
_copy_to_pages(subbuf.pages, subbuf.page_base, obj, this_len); _copy_to_pages(subbuf->pages, subbuf->page_base, obj, this_len);
len -= this_len; len -= this_len;
obj += this_len; obj += this_len;
this_len = min_t(unsigned int, len, subbuf.tail[0].iov_len); this_len = min_t(unsigned int, len, subbuf->tail[0].iov_len);
memcpy(subbuf.tail[0].iov_base, obj, this_len); memcpy(subbuf->tail[0].iov_base, obj, this_len);
out: }
return status;
/* obj is assumed to point to allocated memory of size at least len: */
int write_bytes_to_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, unsigned int len)
{
struct xdr_buf subbuf;
int status;
status = xdr_buf_subsegment(buf, &subbuf, base, len);
if (status != 0)
return status;
__write_bytes_to_xdr_buf(&subbuf, obj, len);
return 0;
} }
int int