Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull Ceph updates for 3.4-rc1 from Sage Weil: "Alex has been busy. There are a range of rbd and libceph cleanups, especially surrounding device setup and teardown, and a few critical fixes in that code. There are more cleanups in the messenger code, virtual xattrs, a fix for CRC calculation/checks, and lots of other miscellaneous stuff. There's a patch from Amon Ott to make inos behave a bit better on 32-bit boxes, some decode check fixes from Xi Wang, and network throttling fix from Jim Schutt, and a couple RBD fixes from Josh Durgin. No new functionality, just a lot of cleanup and bug fixing." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (65 commits) rbd: move snap_rwsem to the device, rename to header_rwsem ceph: fix three bugs, two in ceph_vxattrcb_file_layout() libceph: isolate kmap() call in write_partial_msg_pages() libceph: rename "page_shift" variable to something sensible libceph: get rid of zero_page_address libceph: only call kernel_sendpage() via helper libceph: use kernel_sendpage() for sending zeroes libceph: fix inverted crc option logic libceph: some simple changes libceph: small refactor in write_partial_kvec() libceph: do crc calculations outside loop libceph: separate CRC calculation from byte swapping libceph: use "do" in CRC-related Boolean variables ceph: ensure Boolean options support both senses libceph: a few small changes libceph: make ceph_tcp_connect() return int libceph: encapsulate some messenger cleanup code libceph: make ceph_msgr_wq private libceph: encapsulate connection kvec operations libceph: move prepare_write_banner() ...
Showing
- drivers/block/rbd.c 448 additions, 282 deletionsdrivers/block/rbd.c
- drivers/block/rbd_types.h 0 additions, 4 deletionsdrivers/block/rbd_types.h
- fs/ceph/inode.c 6 additions, 5 deletionsfs/ceph/inode.c
- fs/ceph/mds_client.c 3 additions, 4 deletionsfs/ceph/mds_client.c
- fs/ceph/snap.c 1 addition, 1 deletionfs/ceph/snap.c
- fs/ceph/super.c 17 additions, 2 deletionsfs/ceph/super.c
- fs/ceph/super.h 3 additions, 1 deletionfs/ceph/super.h
- fs/ceph/xattr.c 133 additions, 69 deletionsfs/ceph/xattr.c
- include/linux/ceph/libceph.h 1 addition, 1 deletioninclude/linux/ceph/libceph.h
- include/linux/ceph/messenger.h 1 addition, 4 deletionsinclude/linux/ceph/messenger.h
- net/ceph/ceph_common.c 18 additions, 8 deletionsnet/ceph/ceph_common.c
- net/ceph/messenger.c 235 additions, 221 deletionsnet/ceph/messenger.c
- net/ceph/osdmap.c 2 additions, 1 deletionnet/ceph/osdmap.c
Loading
Please register or sign in to comment