tree 466d9d722742f8f9c553226ffce200dc62f494ab
parent 4dde6dedad736b86bcea3722abb7d8031aeeaa16
parent 9d5a09e659f8414dd3713e2acbfaf8a9e9794aa1
author Linus Torvalds <torvalds@linux-foundation.org> 1323817182 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323817182 -0800

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