tree 8d5b2444f8966e696a8da772eca465995c111204
parent 1e876e3b1a9df25bb04682b0d48aaa7e8ae1fc82
parent 1617e40c1eeeeb857ff4b66acee20ed2acc1b5e7
author Linus Torvalds <torvalds@linux-foundation.org> 1372272466 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1372272466 -1000

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

Pull Ceph fix from Sage Weil:
 "This fixes another problem with using v2 images on 3.10 due to the
  order in which fields are read from the image header.

  Hopefully this is the last one"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: fetch object order before using it