summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-11-11 09:17:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-11-11 09:17:10 -0800
commitef091b3cef2d699568b51559ae8340b996f43230 (patch)
tree51725e4b6d3bb055ca1e9c7ea21d014abf5d4bb1 /fs
parentef5beed9985093da1ac74210abae5cad11530543 (diff)
parent264048afab27d7c27eedf5394714e0b396d787f7 (diff)
downloadlinux-ef091b3cef2d699568b51559ae8340b996f43230.tar.gz
linux-ef091b3cef2d699568b51559ae8340b996f43230.tar.bz2
linux-ef091b3cef2d699568b51559ae8340b996f43230.zip
Merge tag 'ceph-for-4.9-rc5' of git://github.com/ceph/ceph-client
Pull Ceph fixes from Ilya Dryomov: "Ceph's ->read_iter() implementation is incompatible with the new generic_file_splice_read() code that went into -rc1. Switch to the less efficient default_file_splice_read() for now; the proper fix is being held for 4.10. We also have a fix for a 4.8 regression and a trival libceph fixup" * tag 'ceph-for-4.9-rc5' of git://github.com/ceph/ceph-client: libceph: initialize last_linger_id with a large integer libceph: fix legacy layout decode with pool 0 ceph: use default file splice read callback
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,