kmem_cache_free(fuse_req_cachep, req);
return NULL;
}
+ __set_bit(FR_ALLOC_PAGES, &req->flags);
} else if (npages) {
pages = req->inline_pages;
page_descs = req->inline_page_descs;
static void fuse_req_pages_free(struct fuse_req *req)
{
- if (req->pages != req->inline_pages)
+ if (test_bit(FR_ALLOC_PAGES, &req->flags))
kfree(req->pages);
}
memcpy(page_descs, req->page_descs,
sizeof(struct fuse_page_desc) * req->max_pages);
fuse_req_pages_free(req);
+ __set_bit(FR_ALLOC_PAGES, &req->flags);
req->pages = pages;
req->page_descs = page_descs;
req->max_pages = npages;
req->in.h.pid = pid_nr_ns(task_pid(current), fc->pid_ns);
}
+void fuse_args_to_req(struct fuse_req *req, struct fuse_args *args)
+{
+ struct fuse_args_pages *ap = container_of(args, typeof(*ap), args);
+
+ req->in.h.opcode = args->opcode;
+ req->in.h.nodeid = args->nodeid;
+ req->in.numargs = args->in_numargs;
+ memcpy(req->in.args, args->in_args,
+ args->in_numargs * sizeof(struct fuse_in_arg));
+ req->out.argvar = args->out_argvar;
+ req->out.numargs = args->out_numargs;
+ memcpy(req->out.args, args->out_args,
+ args->out_numargs * sizeof(struct fuse_arg));
+
+ if (args->in_pages || args->out_pages) {
+ req->in.argpages = args->in_pages;
+ req->out.argpages = args->out_pages;
+ req->out.page_zeroing = args->page_zeroing;
+ req->out.page_replace = args->page_replace;
+
+ req->pages = ap->pages;
+ req->page_descs = ap->descs;
+ req->num_pages = ap->num_pages;
+ }
+
+}
+
ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)
{
struct fuse_req *req;
/* Needs to be done after fuse_get_req() so that fc->minor is valid */
fuse_adjust_compat(fc, args);
+ fuse_args_to_req(req, args);
- req->in.h.opcode = args->opcode;
- req->in.h.nodeid = args->nodeid;
- req->in.numargs = args->in_numargs;
- memcpy(req->in.args, args->in_args,
- args->in_numargs * sizeof(struct fuse_in_arg));
- req->out.argvar = args->out_argvar;
- req->out.numargs = args->out_numargs;
- memcpy(req->out.args, args->out_args,
- args->out_numargs * sizeof(struct fuse_arg));
if (!args->noreply)
__set_bit(FR_ISREPLY, &req->flags);
__fuse_request_send(fc, req);