diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-07-27 23:28:28 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-07-27 23:28:28 -0700 |
| commit | d3608b5681d238605b7da6be62244e803e24c649 (patch) | |
| tree | 1fc47e9f58e6e938eefd40904745a60986739bde /fs/9p/vfs_dir.c | |
| parent | 650fb4393dff543bc980d361555c489fbdeed088 (diff) | |
| parent | 113fc5a6e8c2288619ff7e8187a6f556b7e0d372 (diff) | |
Merge remote branch 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'fs/9p/vfs_dir.c')
| -rw-r--r-- | fs/9p/vfs_dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c index d61e3b28ce37..36d961f342af 100644 --- a/fs/9p/vfs_dir.c +++ b/fs/9p/vfs_dir.c @@ -146,7 +146,7 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir) while (rdir->head < rdir->tail) { p9stat_init(&st); err = p9stat_read(rdir->buf + rdir->head, - buflen - rdir->head, &st, + rdir->tail - rdir->head, &st, fid->clnt->proto_version); if (err) { P9_DPRINTK(P9_DEBUG_VFS, "returned %d\n", err); |