Commit d0f9c62a authored by Bernd Schubert's avatar Bernd Schubert Committed by Miklos Szeredi
Browse files

fuse: Make fuse_copy non static 



Move 'struct fuse_copy_state' and fuse_copy_* functions
to fuse_dev_i.h to make it available for fuse-io-uring.
'copy_out_args()' is renamed to 'fuse_copy_out_args'.

Signed-off-by: default avatarBernd Schubert <bschubert@ddn.com>
Reviewed-by: default avatarJoanne Koong <joannelkoong@gmail.com>
Reviewed-by: default avatarLuis Henriques <luis@igalia.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 24fe962c

fs/fuse/dev.c

+8 −22
Original line number Diff line number Diff line
@@ -678,21 +678,7 @@ static int unlock_request(struct fuse_req *req) 
	return err;

}



struct fuse_copy_state {

	int write;

	struct fuse_req *req;

	struct iov_iter *iter;

	struct pipe_buffer *pipebufs;

	struct pipe_buffer *currbuf;

	struct pipe_inode_info *pipe;

	unsigned long nr_segs;

	struct page *pg;

	unsigned len;

	unsigned offset;

	unsigned move_pages:1;

};



static void fuse_copy_init(struct fuse_copy_state *cs, int write,

void fuse_copy_init(struct fuse_copy_state *cs, int write,

		    struct iov_iter *iter)

{

	memset(cs, 0, sizeof(*cs));
@@ -1054,7 +1040,7 @@ static int fuse_copy_one(struct fuse_copy_state *cs, void *val, unsigned size) 
}



/* Copy request arguments to/from userspace buffer */

static int fuse_copy_args(struct fuse_copy_state *cs, unsigned numargs,

int fuse_copy_args(struct fuse_copy_state *cs, unsigned numargs,

		   unsigned argpages, struct fuse_arg *args,

		   int zeroing)

{
@@ -1933,7 +1919,7 @@ static struct fuse_req *request_find(struct fuse_pqueue *fpq, u64 unique) 
	return NULL;

}



static int copy_out_args(struct fuse_copy_state *cs, struct fuse_args *args,

int fuse_copy_out_args(struct fuse_copy_state *cs, struct fuse_args *args,

		       unsigned nbytes)

{

	unsigned reqsize = sizeof(struct fuse_out_header);
@@ -2036,7 +2022,7 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud, 
	if (oh.error)

		err = nbytes != sizeof(oh) ? -EINVAL : 0;

	else

		err = copy_out_args(cs, req->args, nbytes);

		err = fuse_copy_out_args(cs, req->args, nbytes);

	fuse_copy_finish(cs);



	spin_lock(&fpq->lock);

fs/fuse/fuse_dev_i.h

+25 −0
Original line number Diff line number Diff line
@@ -12,6 +12,23 @@ 
#define FUSE_INT_REQ_BIT (1ULL << 0)

#define FUSE_REQ_ID_STEP (1ULL << 1)



struct fuse_arg;

struct fuse_args;



struct fuse_copy_state {

	int write;

	struct fuse_req *req;

	struct iov_iter *iter;

	struct pipe_buffer *pipebufs;

	struct pipe_buffer *currbuf;

	struct pipe_inode_info *pipe;

	unsigned long nr_segs;

	struct page *pg;

	unsigned int len;

	unsigned int offset;

	unsigned int move_pages:1;

};



static inline struct fuse_dev *fuse_get_dev(struct file *file)

{

	/*
@@ -23,5 +40,13 @@ static inline struct fuse_dev *fuse_get_dev(struct file *file) 


void fuse_dev_end_requests(struct list_head *head);



void fuse_copy_init(struct fuse_copy_state *cs, int write,

			   struct iov_iter *iter);

int fuse_copy_args(struct fuse_copy_state *cs, unsigned int numargs,

		   unsigned int argpages, struct fuse_arg *args,

		   int zeroing);

int fuse_copy_out_args(struct fuse_copy_state *cs, struct fuse_args *args,

		       unsigned int nbytes);



#endif