tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.34' of git://linux-nfs.org/~bfields/linux:
nfsd4: bug in read_buf

Linus Torvalds 11e39d99 03449cd9

+4 -4
unified split
+4 -4
fs/nfsd/nfs4xdr.c
··· 161 argp->p = page_address(argp->pagelist[0]); 162 argp->pagelist++; 163 if (argp->pagelen < PAGE_SIZE) { 164 - argp->end = p + (argp->pagelen>>2); 165 argp->pagelen = 0; 166 } else { 167 - argp->end = p + (PAGE_SIZE>>2); 168 argp->pagelen -= PAGE_SIZE; 169 } 170 memcpy(((char*)p)+avail, argp->p, (nbytes - avail)); ··· 1426 argp->p = page_address(argp->pagelist[0]); 1427 argp->pagelist++; 1428 if (argp->pagelen < PAGE_SIZE) { 1429 - argp->end = p + (argp->pagelen>>2); 1430 argp->pagelen = 0; 1431 } else { 1432 - argp->end = p + (PAGE_SIZE>>2); 1433 argp->pagelen -= PAGE_SIZE; 1434 } 1435 }
··· 161 argp->p = page_address(argp->pagelist[0]); 162 argp->pagelist++; 163 if (argp->pagelen < PAGE_SIZE) { 164 + argp->end = argp->p + (argp->pagelen>>2); 165 argp->pagelen = 0; 166 } else { 167 + argp->end = argp->p + (PAGE_SIZE>>2); 168 argp->pagelen -= PAGE_SIZE; 169 } 170 memcpy(((char*)p)+avail, argp->p, (nbytes - avail)); ··· 1426 argp->p = page_address(argp->pagelist[0]); 1427 argp->pagelist++; 1428 if (argp->pagelen < PAGE_SIZE) { 1429 + argp->end = argp->p + (argp->pagelen>>2); 1430 argp->pagelen = 0; 1431 } else { 1432 + argp->end = argp->p + (PAGE_SIZE>>2); 1433 argp->pagelen -= PAGE_SIZE; 1434 } 1435 }