tree b88b57915ccc335cb1391abf3da5fa59bd5e6ac5
parent 1c08232cfe5e68c6234305a3abb64d52d89c9ead
parent fca65b4ad72d28cbb43a029114d04b89f06faadb
author Linus Torvalds <torvalds@linux-foundation.org> 1304544140 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1304544140 -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: do not call __mark_dirty_inode under i_lock
  libceph: fix ceph_osdc_alloc_request error checks
  ceph: handle ceph_osdc_new_request failure in ceph_writepages_start
  libceph: fix ceph_msg_new error path
  ceph: use ihold() when i_lock is held