UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

A fix for a 4.7 performance regression, caused by a typo in an if 

condition.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQEcBAABCAAGBQJX0WAXAAoJEEp/3jgCEfOL8bEIAIeVmaU+M/1HuPucc+xiUooy
 IP+LNjhSc52neqDsN/eYjTn4zipu0ZAojPW9geGkPHOnKTKdRqkNLpyWaQcSv0AG
 yOUiJxnfwZ2LuOD2L/EIzqSKWo1lrdhIP/tSyRk0cOhlXn8urKatEOQi1+8H3Jlr
 gzD2PZzXL1jnpCiGPnuYLlh6wmk9Su+7+GCkNOwi1z+j+sM5AupZESPsh6Ze+bYk
 xgii4e21cBQv4NXojLECnfNez3HjYJCqYAUZ55lzSneUkbTRdBoY+pye/FeFKIBe
 9Wb5IRYzvih9Bcdpx+o5RZtCoKhq1XRngjjvv7cHYELQ0JVM4kFwEKrUHMoHhWU=
 =VDDm
 -----END PGP SIGNATURE-----

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()
This commit is contained in:
Linus Torvalds 2016-09-08 12:23:13 -07:00
parent acdfffb5e0 0f5aa88a7b
commit 711bef65e9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/ceph/dir.c
View File

@ -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;