summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoachim Henke <joachim.henke@t-systems.com>2021-02-09 13:42:36 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-13 13:55:16 +0100
commit237ee28818a9cce147651f7dfd88e297ab9e778c (patch)
tree802384f4b07201b0dbacc03117eb36264dba5b25
parent4e78c33874e541979383a761cf9e3de0a24c710c (diff)
downloadlinux-stable-237ee28818a9cce147651f7dfd88e297ab9e778c.tar.gz
linux-stable-237ee28818a9cce147651f7dfd88e297ab9e778c.tar.bz2
linux-stable-237ee28818a9cce147651f7dfd88e297ab9e778c.zip
nilfs2: make splice write available again
commit a35d8f016e0b68634035217d06d1c53863456b50 upstream. Since 5.10, splice() or sendfile() to NILFS2 return EINVAL. This was caused by commit 36e2c7421f02 ("fs: don't allow splice read/write without explicit ops"). This patch initializes the splice_write field in file_operations, like most file systems do, to restore the functionality. Link: https://lkml.kernel.org/r/1612784101-14353-1-git-send-email-konishi.ryusuke@gmail.com Signed-off-by: Joachim Henke <joachim.henke@t-systems.com> Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Tested-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Cc: <stable@vger.kernel.org> [5.10+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nilfs2/file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
index 64bc81363c6c..e1bd592ce700 100644
--- a/fs/nilfs2/file.c
+++ b/fs/nilfs2/file.c
@@ -141,6 +141,7 @@ const struct file_operations nilfs_file_operations = {
/* .release = nilfs_release_file, */
.fsync = nilfs_sync_file,
.splice_read = generic_file_splice_read,
+ .splice_write = iter_file_splice_write,
};
const struct inode_operations nilfs_file_inode_operations = {