Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

fs/nfsd/vfs.c

+3 −2
Original line number Diff line number Diff line
@@ -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: