btrfs: try harder to allocate raid56 stripe cache
[linux-3.10.git] / fs / 9p / vfs_dir.c
index 16c8a2a..ff911e7 100644 (file)
@@ -140,7 +140,7 @@ static int v9fs_dir_readdir(struct file *filp, void *dirent, filldir_t filldir)
        int reclen = 0;
        struct p9_rdir *rdir;
 
-       P9_DPRINTK(P9_DEBUG_VFS, "name %s\n", filp->f_path.dentry->d_name.name);
+       p9_debug(P9_DEBUG_VFS, "name %s\n", filp->f_path.dentry->d_name.name);
        fid = filp->private_data;
 
        buflen = fid->clnt->msize - P9_IOHDRSZ;
@@ -165,11 +165,10 @@ 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);
+                               p9_debug(P9_DEBUG_VFS, "returned %d\n", err);
                                err = -EIO;
                                p9stat_free(&st);
                                goto unlock_and_exit;
@@ -214,7 +213,7 @@ static int v9fs_dir_readdir_dotl(struct file *filp, void *dirent,
        struct p9_dirent curdirent;
        u64 oldoffset = 0;
 
-       P9_DPRINTK(P9_DEBUG_VFS, "name %s\n", filp->f_path.dentry->d_name.name);
+       p9_debug(P9_DEBUG_VFS, "name %s\n", filp->f_path.dentry->d_name.name);
        fid = filp->private_data;
 
        buflen = fid->clnt->msize - P9_READDIRHDRSZ;
@@ -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,11 +240,11 @@ 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,
-                                               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);
+                               p9_debug(P9_DEBUG_VFS, "returned %d\n", err);
                                err = -EIO;
                                goto unlock_and_exit;
                        }
@@ -291,10 +290,10 @@ int v9fs_dir_release(struct inode *inode, struct file *filp)
        struct p9_fid *fid;
 
        fid = filp->private_data;
-       P9_DPRINTK(P9_DEBUG_VFS,
-                       "inode: %p filp: %p fid: %d\n", inode, filp, fid->fid);
-       filemap_write_and_wait(inode->i_mapping);
-       p9_client_clunk(fid);
+       p9_debug(P9_DEBUG_VFS, "inode: %p filp: %p fid: %d\n",
+                inode, filp, fid ? fid->fid : -1);
+       if (fid)
+               p9_client_clunk(fid);
        return 0;
 }
 
@@ -312,4 +311,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,
 };