diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-07-17 22:48:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-07-17 22:48:19 +0400 |
| commit | 3ca462b2813df4bd319588ca8a0112512f54ca24 (patch) | |
| tree | 12403ffd4b5136ab3e3010ed1ff6846e6135cdbb /fs/nfsd/nfs4xdr.c | |
| parent | db26963ceff6f678070a50b4aac113b490aaa55a (diff) | |
| parent | cb5d8be972cfbea114ea56fd63ed5ce1644863df (diff) | |
Automatically merging tracking-linux-3.10.y into merge-linux-linarosamsung-linux-3.10-2013.07ll-20130717.0linux-linaro-3.10.1-2013.07
Conflicting files:
kernel/futex.c
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 6cd86e0fe450..582321a978b0 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -162,8 +162,8 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes) */ memcpy(p, argp->p, avail); /* step to next page */ - argp->p = page_address(argp->pagelist[0]); argp->pagelist++; + argp->p = page_address(argp->pagelist[0]); if (argp->pagelen < PAGE_SIZE) { argp->end = argp->p + (argp->pagelen>>2); argp->pagelen = 0; |