Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph updates from Sage Weil: "There is a lot of refactoring and hardening of the libceph and rbd code here from Ilya that fix various smaller bugs, and a few more important fixes with clone overlap. The main fix is a critical change to the request_fn handling to not sleep that was exposed by the recent mutex changes (which will also go to the 3.16 stable series). Yan Zheng has several fixes in here for CephFS fixing ACL handling, time stamps, and request resends when the MDS restarts. Finally, there are a few cleanups from Himangi Saraogi based on Coccinelle" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (39 commits) libceph: set last_piece in ceph_msg_data_pages_cursor_init() correctly rbd: remove extra newlines from rbd_warn() messages rbd: allocate img_request with GFP_NOIO instead GFP_ATOMIC rbd: rework rbd_request_fn() ceph: fix kick_request...
Showing
- Documentation/ABI/testing/sysfs-bus-rbd 2 additions, 2 deletionsDocumentation/ABI/testing/sysfs-bus-rbd
- drivers/block/rbd.c 365 additions, 324 deletionsdrivers/block/rbd.c
- fs/ceph/acl.c 12 additions, 2 deletionsfs/ceph/acl.c
- fs/ceph/caps.c 1 addition, 1 deletionfs/ceph/caps.c
- fs/ceph/file.c 16 additions, 8 deletionsfs/ceph/file.c
- fs/ceph/mds_client.c 12 additions, 4 deletionsfs/ceph/mds_client.c
- fs/ceph/xattr.c 2 additions, 2 deletionsfs/ceph/xattr.c
- include/linux/ceph/messenger.h 2 additions, 12 deletionsinclude/linux/ceph/messenger.h
- include/linux/ceph/osd_client.h 5 additions, 13 deletionsinclude/linux/ceph/osd_client.h
- net/ceph/messenger.c 33 additions, 14 deletionsnet/ceph/messenger.c
- net/ceph/osd_client.c 88 additions, 41 deletionsnet/ceph/osd_client.c
Please register or sign in to comment