tree df90865eed3cfdf7af8664b5453a90e09d17480a
parent 67b5ad9a63caa2ce56ddd2b22b802dae00d72c13
parent 766fc43973b16f9becb6b7402b3e052dbb84adee
author Linus Torvalds <torvalds@linux-foundation.org> 1294943124 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294943124 -0800

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: fix cleanup when trying to mount inexistent image
  net/ceph: make ceph_msgr_wq non-reentrant
  ceph: fsc->*_wq's aren't used in memory reclaim path
  ceph: Always free allocated memory in osdmap_decode()
  ceph: Makefile: Remove unnessary code
  ceph: associate requests with opening sessions
  ceph: drop redundant r_mds field
  ceph: implement DIRLAYOUTHASH feature to get dir layout from MDS
  ceph: add dir_layout to inode