tree 2ee64e48f39c0c14d454d57a8af022af9e977dd4
parent 6b0cb4eef7bdaa27b8021ea81813fba330a2d94d
parent 52eb5a900a9863a8b77a895f770e5d825c8e02c6
author Linus Torvalds <torvalds@linux-foundation.org> 1351525765 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1351525765 -0700

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

Pull Ceph fixes form Sage Weil:
 "There are two fixes in the messenger code, one that can trigger a NULL
  dereference, and one that error in refcounting (extra put).  There is
  also a trivial fix that in the fs client code that is triggered by NFS
  reexport."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: fix dentry reference leak in encode_fh()
  libceph: avoid NULL kref_put when osd reset races with alloc_msg
  rbd: reset BACKOFF if unable to re-queue