Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2012 23:47:33 +0000 (15:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2012 23:47:33 +0000 (15:47 -0800)
commit6c073a7ee250118b8be3a2379c96fd7f78382b06
treeb398bd9cad821a3543df835e5a0110f270acafb9
parentff05f603c3238010769787f3ba54c48c290ed3e5
parentd23a4b3fd6ef70b80411b39b8c8bc548a219ce70
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: fix safety of rbd_put_client()
  rbd: fix a memory leak in rbd_get_client()
  ceph: create a new session lock to avoid lock inversion
  ceph: fix length validation in parse_reply_info()
  ceph: initialize client debugfs outside of monc->mutex
  ceph: change "ceph.layout" xattr to be "ceph.file.layout"
drivers/block/rbd.c
fs/ceph/caps.c
fs/ceph/dir.c
fs/ceph/mds_client.c
fs/ceph/xattr.c