Forráskód Böngészése

SUNRPC: Clean up xdr_enter_page

Use the xdr_align_pages() helper

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Trond Myklebust 13 éve
szülő
commit
f8bb7f0854
1 módosított fájl, 3 hozzáadás és 3 törlés
  1. 3 3
      net/sunrpc/xdr.c

+ 3 - 3
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)
 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
 	 * Position current pointer at beginning of tail, and
 	 * set remaining message length.
 	 * 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);
 EXPORT_SYMBOL_GPL(xdr_enter_page);