Commit 20235b43 authored by Miklos Szeredi's avatar Miklos Szeredi
Browse files

fuse: cleanup code conditional on fc->writeback_cache 



It's safe to call file_update_time() if writeback cache is not enabled,
since S_NOCMTIME is set in this case.  This part is purely a cleanup.

__fuse_copy_file_range() also calls fuse_write_update_attr() only in the
writeback cache case.  This is inconsistent with other callers, where it's
called unconditionally.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 484ce657

fs/fuse/file.c

+4 −13
Original line number Diff line number Diff line
@@ -211,9 +211,8 @@ void fuse_finish_open(struct inode *inode, struct file *file) 
		i_size_write(inode, 0);

		spin_unlock(&fi->lock);

		truncate_pagecache(inode, 0);

		fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);

		if (fc->writeback_cache)

		file_update_time(file);

		fuse_invalidate_attr_mask(inode, FUSE_STATX_MODSIZE);

	} else if (!(ff->open_flags & FOPEN_KEEP_CACHE)) {

		invalidate_inode_pages2(inode->i_mapping);

	}
@@ -2986,10 +2985,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, 


	/* we could have extended the file */

	if (!(mode & FALLOC_FL_KEEP_SIZE)) {

		bool changed = fuse_write_update_attr(inode, offset + length,

						      length);



		if (changed && fm->fc->writeback_cache)

		if (fuse_write_update_attr(inode, offset + length, length))

			file_update_time(file);

	}
@@ -3104,13 +3100,8 @@ static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in, 
				   ALIGN_DOWN(pos_out, PAGE_SIZE),

				   ALIGN(pos_out + outarg.size, PAGE_SIZE) - 1);



	if (fc->writeback_cache) {

		fuse_write_update_attr(inode_out, pos_out + outarg.size,

				       outarg.size);

	file_update_time(file_out);

	}



	fuse_invalidate_attr_mask(inode_out, FUSE_STATX_MODSIZE);

	fuse_write_update_attr(inode_out, pos_out + outarg.size, outarg.size);



	err = outarg.size;

out: