diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-23 02:55:47 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-23 02:55:47 -0500 |
commit | ca9eed76133c00e7f4b1eeb4c1a6cb800cd2654c (patch) | |
tree | 5f011f4bd00c921e41605b1915c227aeaf411a0d /fs/nfsd/vfs.c | |
parent | 8652cb4b0d87accbe78725fd2a13be2787059649 (diff) | |
parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) |
Merge commit 'v2.6.28-rc6' into x86/debug
Diffstat (limited to 'fs/nfsd/vfs.c')
-rw-r--r-- | fs/nfsd/vfs.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 0bc56f6d9276..4433c8f00163 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c | |||
@@ -1875,11 +1875,11 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func, | |||
1875 | return -ENOMEM; | 1875 | return -ENOMEM; |
1876 | 1876 | ||
1877 | offset = *offsetp; | 1877 | offset = *offsetp; |
1878 | cdp->err = nfserr_eof; /* will be cleared on successful read */ | ||
1879 | 1878 | ||
1880 | while (1) { | 1879 | while (1) { |
1881 | unsigned int reclen; | 1880 | unsigned int reclen; |
1882 | 1881 | ||
1882 | cdp->err = nfserr_eof; /* will be cleared on successful read */ | ||
1883 | buf.used = 0; | 1883 | buf.used = 0; |
1884 | buf.full = 0; | 1884 | buf.full = 0; |
1885 | 1885 | ||
@@ -1912,8 +1912,6 @@ static int nfsd_buffered_readdir(struct file *file, filldir_t func, | |||
1912 | de = (struct buffered_dirent *)((char *)de + reclen); | 1912 | de = (struct buffered_dirent *)((char *)de + reclen); |
1913 | } | 1913 | } |
1914 | offset = vfs_llseek(file, 0, SEEK_CUR); | 1914 | offset = vfs_llseek(file, 0, SEEK_CUR); |
1915 | if (!buf.full) | ||
1916 | break; | ||
1917 | } | 1915 | } |
1918 | 1916 | ||
1919 | done: | 1917 | done: |