summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorYan, Zheng <zyan@redhat.com>2016-11-09 16:47:54 +0800
committerIlya Dryomov <idryomov@gmail.com>2016-11-10 20:13:04 +0100
commit8a8d56176635515d607c520580c73d61f300b409 (patch)
tree0cfb2ccea2e82407267c5af719086ca108c06ca1 /fs
parentbc33b0ca11e3df467777a4fa7639ba488c9d4911 (diff)
downloadlinux-8a8d56176635515d607c520580c73d61f300b409.tar.gz
linux-8a8d56176635515d607c520580c73d61f300b409.tar.bz2
linux-8a8d56176635515d607c520580c73d61f300b409.zip
ceph: use default file splice read callback
Splice read/write implementation changed recently. When using generic_file_splice_read(), iov_iter with type == ITER_PIPE is passed to filesystem's read_iter callback. But ceph_sync_read() can't serve ITER_PIPE iov_iter correctly (ITER_PIPE iov_iter expects pages from page cache). Fixing ceph_sync_read() requires a big patch. So use default splice read callback for now. Signed-off-by: Yan, Zheng <zyan@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/file.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 18630e800208..f995e3528a33 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1770,7 +1770,6 @@ const struct file_operations ceph_file_fops = {
.fsync = ceph_fsync,
.lock = ceph_lock,
.flock = ceph_flock,
- .splice_read = generic_file_splice_read,
.splice_write = iter_file_splice_write,
.unlocked_ioctl = ceph_ioctl,
.compat_ioctl = ceph_ioctl,