Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c103b21c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

Pull fuse update from Miklos Szeredi:
 "The first part makes sure we don't hold up umount with pending async
  requests.  In addition to being a cleanup, this is a small behavioral
  change (for the better) and unlikely to break anything.

  The second part prepares for a cleanup of the fuse device I/O code by
  adding a helper for simple request submission, with some savings in
  line numbers already realized"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: use file_inode() in fuse_file_fallocate()
  fuse: introduce fuse_simple_request() helper
  fuse: reduce max out args
  fuse: hold inode instead of path after release
  fuse: flush requests on umount
  fuse: don't wake up reserved req in fuse_conn_kill()
parents 603ba7e4 1c68271c

fs/fuse/cuse.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static void cuse_process_init_reply(struct fuse_conn *fc, struct fuse_req *req) 
err_region:

	unregister_chrdev_region(devt, 1);

err:

	fuse_conn_kill(fc);

	fuse_abort_conn(fc);

	goto out;

}

fs/fuse/dev.c

+29 −0
Original line number Diff line number Diff line
@@ -511,6 +511,35 @@ void fuse_request_send(struct fuse_conn *fc, struct fuse_req *req) 
}

EXPORT_SYMBOL_GPL(fuse_request_send);



ssize_t fuse_simple_request(struct fuse_conn *fc, struct fuse_args *args)

{

	struct fuse_req *req;

	ssize_t ret;



	req = fuse_get_req(fc, 0);

	if (IS_ERR(req))

		return PTR_ERR(req);



	req->in.h.opcode = args->in.h.opcode;

	req->in.h.nodeid = args->in.h.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));

	fuse_request_send(fc, req);

	ret = req->out.h.error;

	if (!ret && args->out.argvar) {

		BUG_ON(args->out.numargs != 1);

		ret = req->out.args[0].size;

	}

	fuse_put_request(fc, req);



	return ret;

}



static void fuse_request_send_nowait_locked(struct fuse_conn *fc,

					    struct fuse_req *req)

{