---

yaml --- r: 117471 b: refs/heads/master c: c002a6c h: refs/heads/master i: 117469: 57692cd 117467: d74b02d 117463: 285b4a6 117455: 261d012 117439: da77bb2 v: v3
git-mirror · Oct 23, 2008 · ce28746 · ce28746
1 parent 37f344d
commit ce28746
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53c9c5c0e32c69f9df1822e47671c13e3402c82f
+refs/heads/master: c002a6c7977320f95b5edede5ce4e0eeecf291ff
diff --git a/trunk/fs/nfsd/vfs.c b/trunk/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: