diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 15:44:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-31 15:44:08 -0700 |
commit | e06f42d6c127883e58b747048752f44ae208ae47 (patch) | |
tree | 16b28e067eb7a85259d8a2025fb9256fda55bdc5 /fs/nfsd/vfs.c | |
parent | f891caf28febf9d4129716e848227148654b5993 (diff) | |
parent | d7dc61d0a70371b1c6557ea8ffbc60fff94c8168 (diff) |
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
NLM: Set address family before calling nlm_host_rebooted()
nfsd: fix failure to set eof in readdir in some situations
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 0bc56f6d927..848a03e83a4 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1912,6 +1912,7 @@ 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; } |