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

Commit 076a3f55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fuse-fixes-5.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse 

Pull fuse fixes from Miklos Szeredi:
 "A fix for a CUSE regression introduced in v4.20, as well as fixes for
  a couple of old bugs"

* tag 'fuse-fixes-5.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: decrement NR_WRITEBACK_TEMP on the right page
  fuse: call pipe_buf_release() under pipe lock
  cuse: fix ioctl
  fuse: handle zero sized retrieve correctly
parents b66bc777 a2ebba82

fs/fuse/dev.c

+3 −1
Original line number Diff line number Diff line
@@ -1742,7 +1742,6 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, 
	req->in.h.nodeid = outarg->nodeid;

	req->in.numargs = 2;

	req->in.argpages = 1;

	req->page_descs[0].offset = offset;

	req->end = fuse_retrieve_end;



	index = outarg->offset >> PAGE_SHIFT;
@@ -1757,6 +1756,7 @@ static int fuse_retrieve(struct fuse_conn *fc, struct inode *inode, 


		this_num = min_t(unsigned, num, PAGE_SIZE - offset);

		req->pages[req->num_pages] = page;

		req->page_descs[req->num_pages].offset = offset;

		req->page_descs[req->num_pages].length = this_num;

		req->num_pages++;
@@ -2077,8 +2077,10 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe, 


	ret = fuse_dev_do_write(fud, &cs, len);



	pipe_lock(pipe);

	for (idx = 0; idx < nbuf; idx++)

		pipe_buf_release(pipe, &bufs[idx]);

	pipe_unlock(pipe);



out:

	kvfree(bufs);

fs/fuse/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1782,7 +1782,7 @@ static bool fuse_writepage_in_flight(struct fuse_req *new_req, 
		spin_unlock(&fc->lock);



		dec_wb_stat(&bdi->wb, WB_WRITEBACK);

		dec_node_page_state(page, NR_WRITEBACK_TEMP);

		dec_node_page_state(new_req->pages[0], NR_WRITEBACK_TEMP);

		wb_writeout_inc(&bdi->wb);

		fuse_writepage_free(fc, new_req);

		fuse_request_free(new_req);

fs/fuse/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ void fuse_conn_init(struct fuse_conn *fc, struct user_namespace *user_ns) 
	get_random_bytes(&fc->scramble_key, sizeof(fc->scramble_key));

	fc->pid_ns = get_pid_ns(task_active_pid_ns(current));

	fc->user_ns = get_user_ns(user_ns);

	fc->max_pages = FUSE_DEFAULT_MAX_PAGES_PER_REQ;

}

EXPORT_SYMBOL_GPL(fuse_conn_init);
@@ -1162,7 +1163,6 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent) 
	fc->user_id = d.user_id;

	fc->group_id = d.group_id;

	fc->max_read = max_t(unsigned, 4096, d.max_read);

	fc->max_pages = FUSE_DEFAULT_MAX_PAGES_PER_REQ;



	/* Used by get_root_inode() */

	sb->s_fs_info = fc;