diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-08 12:23:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-08 12:23:13 -0700 |
| commit | 711bef65e91d2a06730bf8c64bb00ecab48815a1 (patch) | |
| tree | f9b07c5899a2a9b9f32a3217c348de6e86a9fb78 | |
| parent | Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging (diff) | |
| parent | ceph: do not modify fi->frag in need_reset_readdir() (diff) | |
| download | wireguard-linux-711bef65e91d2a06730bf8c64bb00ecab48815a1.tar.xz wireguard-linux-711bef65e91d2a06730bf8c64bb00ecab48815a1.zip | |
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()
| -rw-r--r-- | fs/ceph/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c index c64a0b794d49..df4b3e6fa563 100644 --- a/fs/ceph/dir.c +++ b/fs/ceph/dir.c @@ -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; |