diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 09:17:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 09:17:10 -0800 |
commit | ef091b3cef2d699568b51559ae8340b996f43230 (patch) | |
tree | 51725e4b6d3bb055ca1e9c7ea21d014abf5d4bb1 /fs/nfs/nfs.h | |
parent | ef5beed9985093da1ac74210abae5cad11530543 (diff) | |
parent | 264048afab27d7c27eedf5394714e0b396d787f7 (diff) |
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/nfs/nfs.h')
0 files changed, 0 insertions, 0 deletions