Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph updates from Sage Weil: "There are some updates and cleanups to the CRUSH placement code, a bug fix with incremental maps, several cleanups and fixes from Josh Durgin in the RBD block device code, a series of cleanups and bug fixes from Alex Elder in the messenger code, and some miscellaneous bounds checking and gfp cleanups/fixes." Fix up trivial conflicts in net/ceph/{messenger.c,osdmap.c} due to the networking people preferring "unsigned int" over just "unsigned". * git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (45 commits) libceph: fix pg_temp updates libceph: avoid unregistering osd request when not registered ceph: add auth buf in prepare_write_connect() ceph: rename prepare_connect_authorizer() ceph: return pointer from prepare_connect_authorizer() ceph: use info returned by get_authorizer ceph: have get_authorizer methods return pointers ceph: ensure auth ops are defined before use ceph: messenger: reduce args to create_authorizer ceph: define ceph_auth_handshake type ceph: messenger: check return from get_authorizer ceph: messenger: rework prepare_connect_authorizer() ceph: messenger: check prepare_write_connect() result ceph: don't set WRITE_PENDING too early ceph: drop msgr argument from prepare_write_connect() ceph: messenger: send banner in process_connect() ceph: messenger: reset connection kvec caller libceph: don't reset kvec in prepare_write_banner() ceph: ignore preferred_osd field ceph: fully initialize new layout ...
Showing
- Documentation/ABI/testing/sysfs-bus-rbd 2 additions, 2 deletionsDocumentation/ABI/testing/sysfs-bus-rbd
- drivers/block/rbd.c 29 additions, 43 deletionsdrivers/block/rbd.c
- fs/ceph/file.c 0 additions, 1 deletionfs/ceph/file.c
- fs/ceph/ioctl.c 47 additions, 55 deletionsfs/ceph/ioctl.c
- fs/ceph/ioctl.h 2 additions, 0 deletionsfs/ceph/ioctl.h
- fs/ceph/mds_client.c 24 additions, 30 deletionsfs/ceph/mds_client.c
- fs/ceph/mds_client.h 2 additions, 3 deletionsfs/ceph/mds_client.h
- fs/ceph/xattr.c 0 additions, 9 deletionsfs/ceph/xattr.c
- include/linux/ceph/auth.h 9 additions, 3 deletionsinclude/linux/ceph/auth.h
- include/linux/ceph/ceph_fs.h 2 additions, 2 deletionsinclude/linux/ceph/ceph_fs.h
- include/linux/ceph/decode.h 7 additions, 2 deletionsinclude/linux/ceph/decode.h
- include/linux/ceph/messenger.h 3 additions, 3 deletionsinclude/linux/ceph/messenger.h
- include/linux/ceph/osd_client.h 5 additions, 6 deletionsinclude/linux/ceph/osd_client.h
- include/linux/ceph/osdmap.h 0 additions, 2 deletionsinclude/linux/ceph/osdmap.h
- include/linux/crush/crush.h 6 additions, 12 deletionsinclude/linux/crush/crush.h
- include/linux/crush/mapper.h 3 additions, 4 deletionsinclude/linux/crush/mapper.h
- net/ceph/auth_none.c 7 additions, 8 deletionsnet/ceph/auth_none.c
- net/ceph/auth_x.c 7 additions, 8 deletionsnet/ceph/auth_x.c
- net/ceph/crush/crush.c 7 additions, 32 deletionsnet/ceph/crush/crush.c
- net/ceph/crush/mapper.c 48 additions, 76 deletionsnet/ceph/crush/mapper.c
Loading
Please register or sign in to comment