tree 99c83d7622066cdf7bb5d467f0017b2360fb7ada
parent 369c4f542fd5e197ace5f9fdd33c558fb2358480
parent 642c0dbde32f34baa7886e988a067089992adc8f
author Linus Torvalds <torvalds@linux-foundation.org> 1340412428 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1340412428 -0700

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

Pull Ceph fixes from Sage Weil:
 "There are a couple of fixes from Yan for bad pointer dereferences in
  the messenger code and when fiddling with page->private after page
  migration, a fix from Alex for a use-after-free in the osd client
  code, and a couple fixes for the message refcounting and shutdown
  ordering."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: flush msgr queue during mon_client shutdown
  rbd: Clear ceph_msg->bio_iter for retransmitted message
  libceph: use con get/put ops from osd_client
  libceph: osd_client: don't drop reply reference too early
  ceph: check PG_Private flag before accessing page->private