From: Andreas Gruenbacher Date: Tue, 6 Oct 2020 12:29:04 +0000 (+0200) Subject: Revert "gfs2: Don't reject a supposedly full bitmap if we have blocks reserved" X-Git-Tag: v5.12-rc1~63^2~1^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fdc2fa21bc72ec06c0c9f0e30b88fe1f2486b75;p=thirdparty%2Fkernel%2Flinux.git Revert "gfs2: Don't reject a supposedly full bitmap if we have blocks reserved" This reverts commit e79e0e1428188b24c3b57309ffa54a33c4ae40c4. It turns out that we're only setting the GBF_FULL flag of a bitmap if we've been scanning from the beginning of the bitmap until the end and we haven't found a single free block, and we're not skipping reservations in that process, either. This means that in gfs2_rbm_find, we can always skip bitmaps with the GBF_FULL flag set. Signed-off-by: Andreas Gruenbacher --- diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index f759f79d2af76..faf9f21f3e98b 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -1754,8 +1754,7 @@ static int gfs2_rbm_find(struct gfs2_rbm *rbm, u8 state, u32 *minext, while(1) { bi = rbm_bi(rbm); - if ((ip == NULL || !gfs2_rs_active(&ip->i_res)) && - test_bit(GBF_FULL, &bi->bi_flags) && + if (test_bit(GBF_FULL, &bi->bi_flags) && (state == GFS2_BLKST_FREE)) goto next_bitmap;