Merge branch 'master' into tk71

[mv-sheeva.git] / fs / 9p / vfs_dir.c

diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c
index 899f168fd19cc4d4aca48e6d26e51aa08b34db59..b84ebe8cefeda6127a59881ed6fef24863f1a5fb 100644 (file)
--- a/fs/9p/vfs_dir.c
+++ b/fs/9p/vfs_dir.c
@@ -242,7 +242,8 @@ static int v9fs_dir_readdir_dotl(struct file *filp, void *dirent,
                while (rdir->head < rdir->tail) {
 
                        err = p9dirent_read(rdir->buf + rdir->head,
-                                               buflen - rdir->head, &curdirent,
+                                               rdir->tail - rdir->head,
+                                               &curdirent,
                                                fid->clnt->proto_version);
                        if (err < 0) {
                                P9_DPRINTK(P9_DEBUG_VFS, "returned %d\n", err);
@@ -314,4 +315,5 @@ const struct file_operations v9fs_dir_operations_dotl = {
        .readdir = v9fs_dir_readdir_dotl,
        .open = v9fs_file_open,
        .release = v9fs_dir_release,
+        .fsync = v9fs_file_fsync_dotl,
 };