summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-12-20 13:13:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-20 13:13:59 -0800
commite37b12e4bb21e7c81732370b0a2b34bd196f380b (patch)
tree7f0894d73040ed9a5e5a1f3fade9938cf3142a75
parent582888130702b86daa44ff6bfee585e4d4050ba0 (diff)
parentc1048828c3dbd96c7e371fae658e5f40e6a45e99 (diff)
downloadlinux-e37b12e4bb21e7c81732370b0a2b34bd196f380b.tar.bz2
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
-rw-r--r--fs/orangefs/file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/orangefs/file.c b/fs/orangefs/file.c
index af375e049aae..ec8ae4257975 100644
--- a/fs/orangefs/file.c
+++ b/fs/orangefs/file.c
@@ -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,