lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 020/211] gfs2: Fix marking bitmaps non-full
    Date
    From: Andreas Gruenbacher <agruenba@redhat.com>

    [ Upstream commit ec23df2b0cf3e1620f5db77972b7fb735f267eff ]

    Reservations in gfs can span multiple gfs2_bitmaps (but they won't span
    multiple resource groups). When removing a reservation, we want to
    clear the GBF_FULL flags of all involved gfs2_bitmaps, not just that of
    the first bitmap.

    Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Reviewed-by: Steven Whitehouse <swhiteho@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/gfs2/rgrp.c | 13 +++++++++++--
    1 file changed, 11 insertions(+), 2 deletions(-)

    diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
    index 0d72baae51509..7cb0672294dfc 100644
    --- a/fs/gfs2/rgrp.c
    +++ b/fs/gfs2/rgrp.c
    @@ -623,7 +623,10 @@ static void __rs_deltree(struct gfs2_blkreserv *rs)
    RB_CLEAR_NODE(&rs->rs_node);

    if (rs->rs_free) {
    - struct gfs2_bitmap *bi = rbm_bi(&rs->rs_rbm);
    + u64 last_block = gfs2_rbm_to_block(&rs->rs_rbm) +
    + rs->rs_free - 1;
    + struct gfs2_rbm last_rbm = { .rgd = rs->rs_rbm.rgd, };
    + struct gfs2_bitmap *start, *last;

    /* return reserved blocks to the rgrp */
    BUG_ON(rs->rs_rbm.rgd->rd_reserved < rs->rs_free);
    @@ -634,7 +637,13 @@ static void __rs_deltree(struct gfs2_blkreserv *rs)
    it will force the number to be recalculated later. */
    rgd->rd_extfail_pt += rs->rs_free;
    rs->rs_free = 0;
    - clear_bit(GBF_FULL, &bi->bi_flags);
    + if (gfs2_rbm_from_block(&last_rbm, last_block))
    + return;
    + start = rbm_bi(&rs->rs_rbm);
    + last = rbm_bi(&last_rbm);
    + do
    + clear_bit(GBF_FULL, &start->bi_flags);
    + while (start++ != last);
    }
    }

    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 21:47    [W:5.226 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site