• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 109c3c02
    Linus Torvalds authored
    Pull Ceph fixes from Sage Weil:
     "Yes, this is a much larger pull than I would like after -rc1.  There
      are a few things included:
    
       - a few fixes for leaks and incorrect assertions
       - a few patches fixing behavior when mapped images are resized
       - handling for cloned/layered images that are flattened out from
         underneath the client
    
      The last bit was non-trivial, and there is some code movement and
      associated cleanup mixed in.  This was ready and was meant to go in
      last week but I missed the boat on Friday.  My only excuse is that I
      was waiting for an all clear from the testing and there were many
      other shiny things to distract me.
    
      Strictly speaking, handling the flatten case isn't a regression and
      could wait, so if you like we can try to pull the series apart, but
      Alex and I would much prefer to have it all in as it is a case real
      users will hit with 3.10."
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (33 commits)
      rbd: re-submit flattened write request (part 2)
      rbd: re-submit write request for flattened clone
      rbd: re-submit read request for flattened clone
      rbd: detect when clone image is flattened
      rbd: reference count parent requests
      rbd: define parent image request routines
      rbd: define rbd_dev_unparent()
      rbd: don't release write request until necessary
      rbd: get parent info on refresh
      rbd: ignore zero-overlap parent
      rbd: support reading parent page data for writes
      rbd: fix parent request size assumption
      libceph: init sent and completed when starting
      rbd: kill rbd_img_request_get()
      rbd: only set up watch for mapped images
      rbd: set mapping read-only flag in rbd_add()
      rbd: support reading parent page data
      rbd: fix an incorrect assertion condition
      rbd: define rbd_dev_v2_header_info()
      rbd: get rid of trivial v1 header wrappers
      ...
    109c3c02
rbd.c 134 KB