projects
/
linux-drm-fsl-dcu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
6a99ad4
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 27 Jul 2010 21:32:59 +0000
(14:32 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 27 Jul 2010 21:32:59 +0000
(14:32 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: Pass the correct end of buffer to p9stat_read
fs/9p/vfs_dir.c
patch
|
blob
|
history
diff --git
a/fs/9p/vfs_dir.c
b/fs/9p/vfs_dir.c
index d61e3b28ce37a09caca5b5c40214b0e1ec109b22..36d961f342af5b95e4e79c42f4a82b5893a73823 100644
(file)
--- 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);