Commit 64d1b4dd authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Andrew Morton
Browse files

fuse: use direct_write_fallback 

Use the generic direct_write_fallback helper instead of duplicating the
logic.

Link: https://lkml.kernel.org/r/20230601145904.1385409-13-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Anna Schumaker <anna@kernel.org>
Cc: Chao Yu <chao@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: "Darrick J. Wong" <djwong@kernel.org>
Cc: Ilya Dryomov <idryomov@gmail.com>
Cc: Jaegeuk Kim <jaegeuk@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Miklos Szeredi <miklos@szeredi.hu>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Trond Myklebust <trond.myklebust@hammerspace.com>
Cc: Xiubo Li <xiubli@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Cc: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 596df33d

fs/fuse/file.c

+2 −22
Original line number Diff line number Diff line
@@ -1340,7 +1340,6 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	struct file *file = iocb->ki_filp;

	struct address_space *mapping = file->f_mapping;

	ssize_t written = 0;

	ssize_t written_buffered = 0;

	struct inode *inode = mapping->host;

	ssize_t err;

	struct fuse_conn *fc = get_fuse_conn(inode);
@@ -1377,30 +1376,11 @@ static ssize_t fuse_cache_write_iter(struct kiocb *iocb, struct iov_iter *from) 
		goto out;



	if (iocb->ki_flags & IOCB_DIRECT) {

		loff_t pos, endbyte;



		written = generic_file_direct_write(iocb, from);

		if (written < 0 || !iov_iter_count(from))

			goto out;



		written_buffered = fuse_perform_write(iocb, from);

		if (written_buffered < 0) {

			err = written_buffered;

			goto out;

		}

		pos = iocb->ki_pos - written_buffered;

		endbyte = iocb->ki_pos - 1;



		err = filemap_write_and_wait_range(file->f_mapping, pos,

						   endbyte);

		if (err)

			goto out;



		invalidate_mapping_pages(file->f_mapping,

					 pos >> PAGE_SHIFT,

					 endbyte >> PAGE_SHIFT);



		written += written_buffered;

		written = direct_write_fallback(iocb, from, written,

				fuse_perform_write(iocb, from));

	} else {

		written = fuse_perform_write(iocb, from);

	}