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

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

fs/ceph/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static bool need_reset_readdir(struct ceph_file_info *fi, loff_t new_pos) 
	if (is_hash_order(new_pos)) {

		/* no need to reset last_name for a forward seek when

		 * dentries are sotred in hash order */

	} else if (fi->frag |= fpos_frag(new_pos)) {

	} else if (fi->frag != fpos_frag(new_pos)) {

		return true;

	}

	rinfo = fi->last_readdir ? &fi->last_readdir->r_reply_info : NULL;