Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217025
b: refs/heads/master
c: 0fe62a3
h: refs/heads/master
i:
  217023: 72f3656
v: v3
  • Loading branch information
Benny Halevy authored and Trond Myklebust committed Aug 29, 2010
1 parent e668777 commit 383665b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b1a7a91ada8388936ffff92cf1ad57b3e926f412
refs/heads/master: 0fe62a35903e11fb41b492bd5b0e8e4c751d5c94
3 changes: 1 addition & 2 deletions trunk/net/sunrpc/xdr.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,16 +395,15 @@ xdr_shrink_pagelen(struct xdr_buf *buf, size_t len)
{
struct kvec *tail;
size_t copy;
char *p;
unsigned int pglen = buf->page_len;

tail = buf->tail;
BUG_ON (len > pglen);

/* Shift the tail first */
if (tail->iov_len != 0) {
p = (char *)tail->iov_base + len;
if (tail->iov_len > len) {
char *p = (char *)tail->iov_base + len;
copy = tail->iov_len - len;
memmove(p, tail->iov_base, copy);
}
Expand Down

0 comments on commit 383665b

Please sign in to comment.