Commit c002a6c7 authored by David Woodhouse's avatar David Woodhouse Committed by Al Viro

[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: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 53c9c5c0
...@@ -1891,7 +1891,6 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func, ...@@ -1891,7 +1891,6 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func,
if (!size) if (!size)
break; break;
de = (struct buffered_dirent *)buf.dirent; de = (struct buffered_dirent *)buf.dirent;
while (size > 0) { while (size > 0) {
offset = de->offset; offset = de->offset;
...@@ -1908,7 +1907,9 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func, ...@@ -1908,7 +1907,9 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func,
size -= reclen; size -= reclen;
de = (struct buffered_dirent *)((char *)de + 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: done:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment