Commit c82a505c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '9p-for-5.10-rc7' of git://github.com/martinetd/linux 

Pull 9p fixes from Dominique Martinet:
 "Restore splice functionality for 9p"

* tag '9p-for-5.10-rc7' of git://github.com/martinetd/linux:
  fs: 9p: add generic splice_write file operation
  fs: 9p: add generic splice_read file operations
parents 72d1249e 960f4f8a

fs/9p/vfs_file.c

+12 −0
Original line number Diff line number Diff line
@@ -655,6 +655,8 @@ const struct file_operations v9fs_cached_file_operations = { 
	.release = v9fs_dir_release,

	.lock = v9fs_file_lock,

	.mmap = v9fs_file_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync,

};
@@ -667,6 +669,8 @@ const struct file_operations v9fs_cached_file_operations_dotl = { 
	.lock = v9fs_file_lock_dotl,

	.flock = v9fs_file_flock_dotl,

	.mmap = v9fs_file_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync_dotl,

};
@@ -678,6 +682,8 @@ const struct file_operations v9fs_file_operations = { 
	.release = v9fs_dir_release,

	.lock = v9fs_file_lock,

	.mmap = generic_file_readonly_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync,

};
@@ -690,6 +696,8 @@ const struct file_operations v9fs_file_operations_dotl = { 
	.lock = v9fs_file_lock_dotl,

	.flock = v9fs_file_flock_dotl,

	.mmap = generic_file_readonly_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync_dotl,

};
@@ -701,6 +709,8 @@ const struct file_operations v9fs_mmap_file_operations = { 
	.release = v9fs_dir_release,

	.lock = v9fs_file_lock,

	.mmap = v9fs_mmap_file_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync,

};
@@ -713,5 +723,7 @@ const struct file_operations v9fs_mmap_file_operations_dotl = { 
	.lock = v9fs_file_lock_dotl,

	.flock = v9fs_file_flock_dotl,

	.mmap = v9fs_mmap_file_mmap,

	.splice_read = generic_file_splice_read,

	.splice_write = iter_file_splice_write,

	.fsync = v9fs_file_fsync_dotl,

};