leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RPC: remove unneeded checks from xdr_truncate_encode()

Browse Source 
Thanks to Andrea Arcangeli for pointing out these checks are
obviously unnecessary given the preceding calculations.

Reported-by: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2014-09-19 17:21:35 -04:00
parent e77a7b4f01
commit ed38c06998
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/sunrpc/xdr.c
View File

@ -617,7 +617,7 @@ void xdr_truncate_encode(struct xdr_stream *xdr, size_t len)
fraglen = min_t(int, buf->len - len, tail->iov_len); fraglen = min_t(int, buf->len - len, tail->iov_len);
tail->iov_len -= fraglen; tail->iov_len -= fraglen;
buf->len -= fraglen; buf->len -= fraglen;
if (tail->iov_len && buf->len == len) { if (tail->iov_len) {
xdr->p = tail->iov_base + tail->iov_len; xdr->p = tail->iov_base + tail->iov_len;
/* xdr->end, xdr->iov should be set already */ /* xdr->end, xdr->iov should be set already */
return; return;
@ -631,7 +631,7 @@ void xdr_truncate_encode(struct xdr_stream *xdr, size_t len)
old = new + fraglen; old = new + fraglen;
xdr->page_ptr -= (old >> PAGE_SHIFT) - (new >> PAGE_SHIFT); xdr->page_ptr -= (old >> PAGE_SHIFT) - (new >> PAGE_SHIFT);
if (buf->page_len && buf->len == len) { if (buf->page_len) {
xdr->p = page_address(*xdr->page_ptr); xdr->p = page_address(*xdr->page_ptr);
xdr->end = (void *)xdr->p + PAGE_SIZE; xdr->end = (void *)xdr->p + PAGE_SIZE;
xdr->p = (void *)xdr->p + (new % PAGE_SIZE); xdr->p = (void *)xdr->p + (new % PAGE_SIZE);