Commit e74c98ca authored Jan 30, 2019 by Andreas Gruenbacher Committed by Linus Torvalds Jan 31, 2019

gfs2: Revert "Fix loop in gfs2_rbm_find"



This reverts commit 2d29f6b9.

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>

parent 9f789567

fs/gfs2/rgrp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1780,9 +1780,9 @@ static int gfs2_rbm_find(struct gfs2_rbm rbm, u8 state, u32 minext,
	goto next_iter;		goto next_iter;
	}		}
	if (ret == -E2BIG) {		if (ret == -E2BIG) {
	n += rbm->bii - initial_bii;
	rbm->bii = 0;		rbm->bii = 0;
	rbm->offset = 0;		rbm->offset = 0;
			n += (rbm->bii - initial_bii);
	goto res_covered_end_of_rgrp;		goto res_covered_end_of_rgrp;
	}		}
	return ret;		return ret;