diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 13:27:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 13:27:51 -0800 |
| commit | 20bf195e9391195925dac4a50e4c2c8165c1b9c5 (patch) | |
| tree | 25a4b8d19de28786e7dfd59699b6de1c61524a58 /fs/nfsd | |
| parent | 9fe190462668d4dc6db56e819322624cbfda919b (diff) | |
| parent | 558b4510f622a3d96cf9d95050a04e7793d343c7 (diff) | |
Merge tag 'ceph-for-5.12-rc1' of git://github.com/ceph/ceph-client
Pull ceph updates from Ilya Dryomov:
"With netfs helper library and fscache rework delayed, just a few cap
handling improvements to avoid grabbing mmap_lock in some code paths
and deal with capsnaps better and a mount option cleanup"
* tag 'ceph-for-5.12-rc1' of git://github.com/ceph/ceph-client:
ceph: defer flushing the capsnap if the Fb is used
libceph: remove osdtimeout option entirely
libceph: deprecate [no]cephx_require_signatures options
ceph: allow queueing cap/snap handling after putting cap references
ceph: clean up inode work queueing
ceph: fix flush_snap logic after putting caps
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions