[PATCH] fuse: transfer readdir data through device

[mirror_ubuntu-zesty-kernel.git] / fs / fuse / dev.c

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index ca6fc0e96d7c77762e26dd96a106541f07e3c529..e4ada021d0876ec0f13dab80935bc65d8bd8d8b3 100644 (file)
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -731,13 +731,6 @@ static struct fuse_req *request_find(struct fuse_conn *fc, u64 unique)
        return NULL;
 }
 
-/* fget() needs to be done in this context */
-static void process_getdir(struct fuse_req *req)
-{
-       struct fuse_getdir_out_i *arg = req->out.args[0].value;
-       arg->file = fget(arg->fd);
-}
-
 static int copy_out_args(struct fuse_copy_state *cs, struct fuse_out *out,
                         unsigned nbytes)
 {
@@ -817,8 +810,6 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,
        if (!err) {
                if (req->interrupted)
                        err = -ENOENT;
-               else if (req->in.h.opcode == FUSE_GETDIR && !oh.error)
-                       process_getdir(req);
        } else if (!req->interrupted)
                req->out.h.error = -EIO;
        request_end(fc, req);