Merge tag 'ceph-for-4.8-rc6' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Sep 2016 19:23:13 +0000 (12:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Sep 2016 19:23:13 +0000 (12:23 -0700)
commit711bef65e91d2a06730bf8c64bb00ecab48815a1
treef9b07c5899a2a9b9f32a3217c348de6e86a9fb78
parentacdfffb5e003858e0f4a70525101f584e393323e
parent0f5aa88a7bb28b73253fb42b3df8202142769f39
Merge tag 'ceph-for-4.8-rc6' of git://github.com/ceph/ceph-client

Pull ceph fix from Ilya Dryomov:
 "A fix for a 4.7 performance regression, caused by a typo in an if
  condition"

* tag 'ceph-for-4.8-rc6' of git://github.com/ceph/ceph-client:
  ceph: do not modify fi->frag in need_reset_readdir()