Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 56b59b42
    Linus Torvalds authored
    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()
      ...
    56b59b42