mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux: Fix nfsd truncation of readdir results
This commit is contained in:
commit
8b805ef617
1 changed files with 1 additions and 4 deletions
|
@ -1875,11 +1875,11 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func,
|
|||
return -ENOMEM;
|
||||
|
||||
offset = *offsetp;
|
||||
cdp->err = nfserr_eof; /* will be cleared on successful read */
|
||||
|
||||
while (1) {
|
||||
unsigned int reclen;
|
||||
|
||||
cdp->err = nfserr_eof; /* will be cleared on successful read */
|
||||
buf.used = 0;
|
||||
buf.full = 0;
|
||||
|
||||
|
@ -1912,9 +1912,6 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func,
|
|||
de = (struct buffered_dirent *)((char *)de + reclen);
|
||||
}
|
||||
offset = vfs_llseek(file, 0, SEEK_CUR);
|
||||
cdp->err = nfserr_eof;
|
||||
if (!buf.full)
|
||||
break;
|
||||
}
|
||||
|
||||
done:
|
||||
|
|
Loading…
Reference in a new issue