diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2019-01-30 15:30:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-31 14:45:11 -0500 |
commit | e74c98ca2d6ae4376cc15fa2a22483430909d96b (patch) | |
tree | 5ae8c76727a609e78aca49dd63030a984444265f /fs/gfs2 | |
parent | 9f789567142c0cd1ffd6c28c56eed40cb36495ca (diff) |
gfs2: Revert "Fix loop in gfs2_rbm_find"
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>
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/rgrp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 831d7cb5a49c..17a8d3b43990 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c | |||
@@ -1780,9 +1780,9 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext, | |||
1780 | goto next_iter; | 1780 | goto next_iter; |
1781 | } | 1781 | } |
1782 | if (ret == -E2BIG) { | 1782 | if (ret == -E2BIG) { |
1783 | n += rbm->bii - initial_bii; | ||
1784 | rbm->bii = 0; | 1783 | rbm->bii = 0; |
1785 | rbm->offset = 0; | 1784 | rbm->offset = 0; |
1785 | n += (rbm->bii - initial_bii); | ||
1786 | goto res_covered_end_of_rgrp; | 1786 | goto res_covered_end_of_rgrp; |
1787 | } | 1787 | } |
1788 | return ret; | 1788 | return ret; |