tree f105b068410e48f5b2d65e85802a9d4bfa3e0638
parent 0624bcaaf06c1fe5aca4e72287a3f13026764d36
parent 3bd58143bafc56dbc07f4f085e4d7e018d332674
author Linus Torvalds <torvalds@linux-foundation.org> 1399328222 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1399328222 -0700

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

Pull Ceph fixes from Sage Weil:
 "First, there is a critical fix for the new primary-affinity function
  that went into -rc1.

  The second batch of patches from Zheng fix a range of problems with
  directory fragmentation, readdir, and a few odds and ends for cephfs"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: reserve caps for file layout/lock MDS requests
  ceph: avoid releasing caps that are being used
  ceph: clear directory's completeness when creating file
  libceph: fix non-default values check in apply_primary_affinity()
  ceph: use fpos_cmp() to compare dentry positions
  ceph: check directory's completeness before emitting directory entry