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

Merge tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux 

Pull orangefs update from Mike Marshall:
 "Add splice file operations"

* tag 'for-linus-5.11-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: add splice file operations
parents 58288813 c1048828

fs/orangefs/file.c

+2 −0
Original line number Diff line number Diff line
@@ -663,6 +663,8 @@ const struct file_operations orangefs_file_operations = { 
	.unlocked_ioctl	= orangefs_ioctl,

	.mmap		= orangefs_file_mmap,

	.open		= generic_file_open,

	.splice_read    = generic_file_splice_read,

	.splice_write   = iter_file_splice_write,

	.flush		= orangefs_flush,

	.release	= orangefs_file_release,

	.fsync		= orangefs_fsync,

CRA Git | Maintained and supported by SUSTech CRA and CCSE