]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2011 22:59:42 +0000 (14:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Dec 2011 22:59:42 +0000 (14:59 -0800)
commitc6395332df7dd39d1b1984eaacef7185f42118bb
tree466d9d722742f8f9c553226ffce200dc62f494ab
parentf3da3610507552c1a5fc08f4cf2e6e0dab4eab17
parent56917900638666846d4d7920aa35e20b1c871da2
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: add missing spin_unlock at ceph_mdsc_build_path()
  ceph: fix SEEK_CUR, SEEK_SET regression
  crush: fix mapping calculation when force argument doesn't exist
  ceph: use i_ceph_lock instead of i_lock
  rbd: remove buggy rollback functionality
  rbd: return an error when an invalid header is read
  ceph: fix rasize reporting by ceph_show_options