Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph fixes from Sage Weil: "We have a few wire protocol compatibility fixes, ports of a few recent CRUSH mapping changes, and a couple error path fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: libceph: MOSDOpReply v7 encoding libceph: advertise support for TUNABLES5 crush: decode and initialize chooseleaf_stable crush: add chooseleaf_stable tunable crush: ensure take bucket value is valid crush: ensure bucket id is valid before indexing buckets array ceph: fix snap context leak in error path ceph: checking for IS_ERR instead of NULL
Showing
- fs/ceph/file.c 3 additions, 3 deletionsfs/ceph/file.c
- include/linux/ceph/ceph_features.h 15 additions, 1 deletioninclude/linux/ceph/ceph_features.h
- include/linux/crush/crush.h 7 additions, 1 deletioninclude/linux/crush/crush.h
- net/ceph/crush/mapper.c 26 additions, 7 deletionsnet/ceph/crush/mapper.c
- net/ceph/osd_client.c 10 additions, 0 deletionsnet/ceph/osd_client.c
- net/ceph/osdmap.c 14 additions, 5 deletionsnet/ceph/osdmap.c
Loading
Please register or sign in to comment