diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-21 14:53:10 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-06-28 17:20:46 -0400 |
| commit | f8bb7f08549a1ced9ceb69a9bd5e163122044ab2 (patch) | |
| tree | 9e67fa0a419c7ea3d8469d215bd2c8e80f8d74dc /net/sunrpc | |
| parent | 3994ee6fbf5185b3183f4585432226e786bfe86c (diff) | |
| download | linux-3.10-f8bb7f08549a1ced9ceb69a9bd5e163122044ab2.tar.gz linux-3.10-f8bb7f08549a1ced9ceb69a9bd5e163122044ab2.tar.bz2 linux-3.10-f8bb7f08549a1ced9ceb69a9bd5e163122044ab2.zip | |
SUNRPC: Clean up xdr_enter_page
Use the xdr_align_pages() helper
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xdr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index 03603f332fe..2e3694eccd8 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -826,13 +826,13 @@ EXPORT_SYMBOL_GPL(xdr_read_pages); */ void xdr_enter_page(struct xdr_stream *xdr, unsigned int len) { - len = xdr_read_pages(xdr, len); + len = xdr_align_pages(xdr, len); /* * Position current pointer at beginning of tail, and * set remaining message length. */ - xdr_set_page_base(xdr, 0, len); - xdr->nwords += XDR_QUADLEN(xdr->buf->page_len); + if (len != 0) + xdr_set_page_base(xdr, 0, len); } EXPORT_SYMBOL_GPL(xdr_enter_page); |