Commit e37b12e4 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -663,6 +663,8 @@ const struct file_operations orangefs_file_operations = { ...@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment