tree 2c387b6e3f628484a1f4bdc964e529f89d5f5821
parent f5c07a2d8acfc98e00d3be6298f979e5b3175953
parent a6a5349d17f2a5c37079826f1a1474c3d08c6b53
author Linus Torvalds <torvalds@linux-foundation.org> 1271295931 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271295931 -0700

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:
  ceph: use separate class for ceph sockets' sk_lock
  ceph: reserve one more caps space when doing readdir
  ceph: queue_cap_snap should always queue dirty context
  ceph: fix dentry reference leak in dcache readdir
  ceph: decode v5 of osdmap (pool names) [protocol change]
  ceph: fix ack counter reset on connection reset
  ceph: fix leaked inode ref due to snap metadata writeback race
  ceph: fix snap context reference leaks
  ceph: allow writeback of snapped pages older than 'oldest' snapc
  ceph: fix dentry rehashing on virtual .snap dir