diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-08-17 18:21:18 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-23 11:13:11 +0200 |
| commit | c002a6c7977320f95b5edede5ce4e0eeecf291ff (patch) | |
| tree | 9646d953e813251de9bd991ed877f1f1f46af7c4 /fs/nfsd | |
| parent | [PATCH] prepare vfs_readdir() callers to returning filldir result (diff) | |
| download | linux-c002a6c7977320f95b5edede5ce4e0eeecf291ff.tar.xz linux-c002a6c7977320f95b5edede5ce4e0eeecf291ff.zip | |
[PATCH] Optimise NFS readdir hack slightly.
Avoid calling the underlying ->readdir() again when we reached the end
already; keep going round the loop only if we stopped due to our own
buffer being full.
[AV: tidy the things up a bit, while we are there]
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/vfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index e3e37f7c8477..49d4b8725ca3 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1891,7 +1891,6 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func, if (!size) break; - de = (struct buffered_dirent *)buf.dirent; while (size > 0) { offset = de->offset; @@ -1908,7 +1907,9 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func, size -= reclen; de = (struct buffered_dirent *)((char *)de + reclen); } - offset = vfs_llseek(file, 0, 1); + offset = vfs_llseek(file, 0, SEEK_CUR); + if (!buf.full) + break; } done: |