diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-09 12:25:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-09 12:25:44 -0800 |
| commit | 8b805ef617cf0e02f6d18b891f8deb6246421b01 (patch) | |
| tree | 35759385f2834d48a10025f949e49e0c77095876 /fs | |
| parent | cb56d98e2a7530615899597551db685d68a2e852 (diff) | |
| parent | b726e923ea4d216027e466aa602d914e4b4a63af (diff) | |
| download | op-kernel-dev-8b805ef617cf0e02f6d18b891f8deb6246421b01.zip op-kernel-dev-8b805ef617cf0e02f6d18b891f8deb6246421b01.tar.gz | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/vfs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 848a03e..4433c8f 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -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: |
