summaryrefslogtreecommitdiffstats
path: root/fs/nfs/pnfs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-22 17:47:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-22 17:47:08 -0700
commit002b758b6dc4d840e662f25625f696d7b43d48f4 (patch)
tree99c83d7622066cdf7bb5d467f0017b2360fb7ada /fs/nfs/pnfs.c
parent369c4f542fd5e197ace5f9fdd33c558fb2358480 (diff)
parent642c0dbde32f34baa7886e988a067089992adc8f (diff)
downloadlinux-002b758b6dc4d840e662f25625f696d7b43d48f4.tar.gz
linux-002b758b6dc4d840e662f25625f696d7b43d48f4.tar.bz2
linux-002b758b6dc4d840e662f25625f696d7b43d48f4.zip
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
Diffstat (limited to 'fs/nfs/pnfs.c')
0 files changed, 0 insertions, 0 deletions