moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2020-12-20 13:13:59 -08:00
parent 5828881307 c1048828c3
commit e37b12e4bb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/orangefs/file.c
View File

@@ -663,6 +663,8 @@ const struct file_operations orangefs_file_operations = {
.unlocked_ioctl = orangefs_ioctl, .unlocked_ioctl = orangefs_ioctl,
.mmap = orangefs_file_mmap, .mmap = orangefs_file_mmap,
.open = generic_file_open, .open = generic_file_open,
.splice_read = generic_file_splice_read,
.splice_write = iter_file_splice_write,
.flush = orangefs_flush, .flush = orangefs_flush,
.release = orangefs_file_release, .release = orangefs_file_release,
.fsync = orangefs_fsync, .fsync = orangefs_fsync,