summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAndreas Gruenbacher2019-01-30 21:30:36 +0100
committerGreg Kroah-Hartman2019-02-06 17:30:13 +0100
commit8b9be9db8a2ac5ec2046cc95df35487e5aaa136c (patch)
tree12fc2badc5ec9deab7f5292f0fdb04f793b782aa /fs
parentgpio: sprd: Fix incorrect irq type setting for the async EIC (diff)
downloadkernel-qcow2-linux-8b9be9db8a2ac5ec2046cc95df35487e5aaa136c.tar.gz
kernel-qcow2-linux-8b9be9db8a2ac5ec2046cc95df35487e5aaa136c.tar.xz
kernel-qcow2-linux-8b9be9db8a2ac5ec2046cc95df35487e5aaa136c.zip
gfs2: Revert "Fix loop in gfs2_rbm_find"
commit e74c98ca2d6ae4376cc15fa2a22483430909d96b upstream. This reverts commit 2d29f6b96d8f80322ed2dd895bca590491c38d34. It turns out that the fix can lead to a ~20 percent performance regression in initial writes to the page cache according to iozone. Let's revert this for now to have more time for a proper fix. Cc: stable@vger.kernel.org # v3.13+ Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/rgrp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index e978f6930575..449d0cb45a84 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1747,9 +1747,9 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext,
goto next_iter;
}
if (ret == -E2BIG) {
- n += rbm->bii - initial_bii;
rbm->bii = 0;
rbm->offset = 0;
+ n += (rbm->bii - initial_bii);
goto res_covered_end_of_rgrp;
}
return ret;