The parameter's origin type is long. On an i386 architecture, it can

[karo-tx-linux.git] / fs / 9p / vfs_dir.c

diff --git a/fs/9p/vfs_dir.c b/fs/9p/vfs_dir.c
index 9c2bdda5cd9de6556e6907711a38953041aa1ef5..598fff1a54e59f7eafedc2b7c87e77300228b9d6 100644 (file)
--- a/fs/9p/vfs_dir.c
+++ b/fs/9p/vfs_dir.c
@@ -165,9 +165,8 @@ 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,
-                                               rdir->tail - rdir->head, &st,
-                                               fid->clnt->proto_version);
+                       err = p9stat_read(fid->clnt, rdir->buf + rdir->head,
+                                         rdir->tail - rdir->head, &st);
                        if (err) {
                                P9_DPRINTK(P9_DEBUG_VFS, "returned %d\n", err);
                                err = -EIO;
@@ -231,7 +230,7 @@ static int v9fs_dir_readdir_dotl(struct file *filp, void *dirent,
        while (err == 0) {
                if (rdir->tail == rdir->head) {
                        err = p9_client_readdir(fid, rdir->buf, buflen,
-                                                               filp->f_pos);
+                                               filp->f_pos);
                        if (err <= 0)
                                goto unlock_and_exit;
 
@@ -241,10 +240,9 @@ static int v9fs_dir_readdir_dotl(struct file *filp, void *dirent,
 
                while (rdir->head < rdir->tail) {
 
-                       err = p9dirent_read(rdir->buf + rdir->head,
-                                               rdir->tail - rdir->head,
-                                               &curdirent,
-                                               fid->clnt->proto_version);
+                       err = p9dirent_read(fid->clnt, rdir->buf + rdir->head,
+                                           rdir->tail - rdir->head,
+                                           &curdirent);
                        if (err < 0) {
                                P9_DPRINTK(P9_DEBUG_VFS, "returned %d\n", err);
                                err = -EIO;