Commit 711bef65 authored by Linus Torvalds's avatar Linus Torvalds

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()
parents acdfffb5 0f5aa88a
...@@ -597,7 +597,7 @@ static bool need_reset_readdir(struct ceph_file_info *fi, loff_t new_pos) ...@@ -597,7 +597,7 @@ static bool need_reset_readdir(struct ceph_file_info *fi, loff_t new_pos)
if (is_hash_order(new_pos)) { if (is_hash_order(new_pos)) {
/* no need to reset last_name for a forward seek when /* no need to reset last_name for a forward seek when
* dentries are sotred in hash order */ * dentries are sotred in hash order */
} else if (fi->frag |= fpos_frag(new_pos)) { } else if (fi->frag != fpos_frag(new_pos)) {
return true; return true;
} }
rinfo = fi->last_readdir ? &fi->last_readdir->r_reply_info : NULL; rinfo = fi->last_readdir ? &fi->last_readdir->r_reply_info : NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment