tree a582e83d1706b7f69ad6707f7102b5dd59e0fd60
parent 42be3f35a3ef0b64af80394afc5873aa5cf70871
parent 0ec1d15ec6ed513ab2cc86c67d94761d71228a32
author Linus Torvalds <torvalds@linux-foundation.org> 1391805356 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1391805356 -0800

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

Pull ceph fixes from Sage Weil:
 "There is an RBD fix for a crash due to the immutable bio changes, an
  error path fix, and a locking fix in the recent redirect support"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: do not dereference a NULL bio pointer
  libceph: take map_sem for read in handle_reply()
  libceph: factor out logic from ceph_osdc_start_request()
  libceph: fix error handling in ceph_osdc_init()