Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fe62a35 authored by Benny Halevy's avatar Benny Halevy Committed by Trond Myklebust
Browse files

sunrpc: clean up xdr_shrink_pagelen use of temporary pointer 



char *p is used only as a shorthand for tail->iov_base + len in a nested
block.  Move it there.

Signed-off-by: default avatarBenny Halevy <bhalevy@panasas.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b1a7a91a

net/sunrpc/xdr.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -395,7 +395,6 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len) 
{

{

	struct kvec *tail;

	struct kvec *tail;

	size_t copy;

	size_t copy;

	char *p;

	unsigned int pglen = buf->page_len;

	unsigned int pglen = buf->page_len;





	tail = buf->tail;

	tail = buf->tail;
@@ -403,8 +402,8 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len) 




	/* Shift the tail first */

	/* Shift the tail first */

	if (tail->iov_len != 0) {

	if (tail->iov_len != 0) {

		p = (char *)tail->iov_base + len;

		if (tail->iov_len > len) {

		if (tail->iov_len > len) {

			char *p = (char *)tail->iov_base + len;

			copy = tail->iov_len - len;

			copy = tail->iov_len - len;

			memmove(p, tail->iov_base, copy);

			memmove(p, tail->iov_base, copy);

		}

		}