Commit 8b9be9db authored Jan 30, 2019 by Andreas Gruenbacher Committed by Greg Kroah-Hartman Feb 06, 2019

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>

parent 83c22cd1

fs/gfs2/rgrp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;