Commit 81dcc797 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull fuse fixes from Miklos Szeredi:

 - Fix cached size after passthrough writes

   This fix needed a trivial change in the backing-file API, which
   resulted in some non-fuse files being touched.

 - Revert a commit meant as a cleanup but which triggered a WARNING

 - Remove a stray debug line left-over

* tag 'fuse-fixes-6.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: remove stray debug line
  Revert "fuse: move initialization of fuse_file to fuse_writepages() instead of in callback"
  fuse: update inode size after extending passthrough write
  fs: pass offset and result to backing_file end_write() callback
parents f6470533 d34a5575

fs/backing-file.c

+4 −4
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct backing_aio { 
	refcount_t ref;

	struct kiocb *orig_iocb;

	/* used for aio completion */

	void (*end_write)(struct file *);

	void (*end_write)(struct file *, loff_t, ssize_t);

	struct work_struct work;

	long res;

};
@@ -109,7 +109,7 @@ static void backing_aio_cleanup(struct backing_aio *aio, long res) 
	struct kiocb *orig_iocb = aio->orig_iocb;



	if (aio->end_write)

		aio->end_write(orig_iocb->ki_filp);

		aio->end_write(orig_iocb->ki_filp, iocb->ki_pos, res);



	orig_iocb->ki_pos = iocb->ki_pos;

	backing_aio_put(aio);
@@ -239,7 +239,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter, 


		ret = vfs_iter_write(file, iter, &iocb->ki_pos, rwf);

		if (ctx->end_write)

			ctx->end_write(ctx->user_file);

			ctx->end_write(ctx->user_file, iocb->ki_pos, ret);

	} else {

		struct backing_aio *aio;
@@ -317,7 +317,7 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe, 
	revert_creds(old_cred);



	if (ctx->end_write)

		ctx->end_write(ctx->user_file);

		ctx->end_write(ctx->user_file, ppos ? *ppos : 0, ret);



	return ret;

}

fs/fuse/file.c

+12 −6
Original line number Diff line number Diff line
@@ -2288,6 +2288,13 @@ static int fuse_writepages_fill(struct folio *folio, 
	struct folio *tmp_folio;

	int err;



	if (!data->ff) {

		err = -EIO;

		data->ff = fuse_write_file_get(fi);

		if (!data->ff)

			goto out_unlock;

	}



	if (wpa && fuse_writepage_need_send(fc, &folio->page, ap, data)) {

		fuse_writepages_send(data);

		data->wpa = NULL;
@@ -2351,13 +2358,13 @@ static int fuse_writepages(struct address_space *mapping, 
			   struct writeback_control *wbc)

{

	struct inode *inode = mapping->host;

	struct fuse_inode *fi = get_fuse_inode(inode);

	struct fuse_conn *fc = get_fuse_conn(inode);

	struct fuse_fill_wb_data data;

	int err;



	err = -EIO;

	if (fuse_is_bad(inode))

		return -EIO;

		goto out;



	if (wbc->sync_mode == WB_SYNC_NONE &&

	    fc->num_background >= fc->congestion_threshold)
@@ -2365,9 +2372,7 @@ static int fuse_writepages(struct address_space *mapping, 


	data.inode = inode;

	data.wpa = NULL;

	data.ff = fuse_write_file_get(fi);

	if (!data.ff)

		return -EIO;

	data.ff = NULL;



	err = -ENOMEM;

	data.orig_pages = kcalloc(fc->max_pages,
@@ -2381,10 +2386,11 @@ static int fuse_writepages(struct address_space *mapping, 
		WARN_ON(!data.wpa->ia.ap.num_pages);

		fuse_writepages_send(&data);

	}

	if (data.ff)

		fuse_file_put(data.ff, false);



	kfree(data.orig_pages);

out:

	fuse_file_put(data.ff, false);

	return err;

}

fs/fuse/passthrough.c

+4 −5
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ static void fuse_file_accessed(struct file *file) 
	fuse_invalidate_atime(inode);

}



static void fuse_file_modified(struct file *file)

static void fuse_passthrough_end_write(struct file *file, loff_t pos, ssize_t ret)

{

	struct inode *inode = file_inode(file);



	fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);

	fuse_write_update_attr(inode, pos, ret);

}



ssize_t fuse_passthrough_read_iter(struct kiocb *iocb, struct iov_iter *iter)
@@ -63,7 +63,7 @@ ssize_t fuse_passthrough_write_iter(struct kiocb *iocb, 
	struct backing_file_ctx ctx = {

		.cred = ff->cred,

		.user_file = file,

		.end_write = fuse_file_modified,

		.end_write = fuse_passthrough_end_write,

	};



	pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu\n", __func__,
@@ -110,7 +110,7 @@ ssize_t fuse_passthrough_splice_write(struct pipe_inode_info *pipe, 
	struct backing_file_ctx ctx = {

		.cred = ff->cred,

		.user_file = out,

		.end_write = fuse_file_modified,

		.end_write = fuse_passthrough_end_write,

	};



	pr_debug("%s: backing_file=0x%p, pos=%lld, len=%zu, flags=0x%x\n", __func__,
@@ -234,7 +234,6 @@ int fuse_backing_open(struct fuse_conn *fc, struct fuse_backing_map *map) 
		goto out;



	backing_sb = file_inode(file)->i_sb;

	pr_info("%s: %x:%pD %i\n", __func__, backing_sb->s_dev, file, backing_sb->s_stack_depth);

	res = -ELOOP;

	if (backing_sb->s_stack_depth >= fc->max_stack_depth)

		goto out_fput;

fs/overlayfs/file.c

+7 −2
Original line number Diff line number Diff line
@@ -231,6 +231,11 @@ static void ovl_file_modified(struct file *file) 
	ovl_copyattr(file_inode(file));

}



static void ovl_file_end_write(struct file *file, loff_t pos, ssize_t ret)

{

	ovl_file_modified(file);

}



static void ovl_file_accessed(struct file *file)

{

	struct inode *inode, *upperinode;
@@ -294,7 +299,7 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter) 
	struct backing_file_ctx ctx = {

		.cred = ovl_creds(inode->i_sb),

		.user_file = file,

		.end_write = ovl_file_modified,

		.end_write = ovl_file_end_write,

	};



	if (!iov_iter_count(iter))
@@ -364,7 +369,7 @@ static ssize_t ovl_splice_write(struct pipe_inode_info *pipe, struct file *out, 
	struct backing_file_ctx ctx = {

		.cred = ovl_creds(inode->i_sb),

		.user_file = out,

		.end_write = ovl_file_modified,

		.end_write = ovl_file_end_write,

	};



	inode_lock(inode);

include/linux/backing-file.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct backing_file_ctx { 
	const struct cred *cred;

	struct file *user_file;

	void (*accessed)(struct file *);

	void (*end_write)(struct file *);

	void (*end_write)(struct file *, loff_t, ssize_t);

};



struct file *backing_file_open(const struct path *user_path, int flags,