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

Commit 8b805ef6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents cb56d98e b726e923

fs/nfsd/vfs.c

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