From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C546C432C3 for ; Sat, 16 Nov 2019 16:15:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 34C562089D for ; Sat, 16 Nov 2019 16:15:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573920930; bh=7Z34qvYkmT7kuRZmfAtggVFqZxeEkdnPdZccfyOiPeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=F7ACLkI1kamkV7I++wCsbELz1wGjih5DAps4UjNX+JYg146NiGgAQshF1AQ+1c08x AXcw8EmiSKjrwEiTgYxxEKJsDZObCgkLSZ5rkOxgD+EMfv+96tZamyWqpvk+xNu0Be C3UkKhiTbxE057MW/4xH4BAlrsIy4pWxUs1lxMSQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731934AbfKPQP2 (ORCPT ); Sat, 16 Nov 2019 11:15:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:54234 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728920AbfKPPrb (ORCPT ); Sat, 16 Nov 2019 10:47:31 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F12BE208C0; Sat, 16 Nov 2019 15:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919251; bh=7Z34qvYkmT7kuRZmfAtggVFqZxeEkdnPdZccfyOiPeE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qG1ASKEsWMHiSkXDq/mdkIRPtz4LW7DE9JRMO9JmOmnvZyR/OQflfCWgvisF0Lk7U p2cfJHKGAXcXQNRxmWkvBpAduG4f6nFRjTFXE2KTwbyKOa+W+yQObyenxnSVAnpxwo lzbcGslGIBAZyvwUYzcQv50rYMjsuPSW2yFKwao8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andreas Gruenbacher , Bob Peterson , Steven Whitehouse , Sasha Levin , cluster-devel@redhat.com Subject: [PATCH AUTOSEL 4.14 003/150] gfs2: Fix marking bitmaps non-full Date: Sat, 16 Nov 2019 10:45:01 -0500 Message-Id: <20191116154729.9573-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154729.9573-1-sashal@kernel.org> References: <20191116154729.9573-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andreas Gruenbacher [ 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 Signed-off-by: Bob Peterson Reviewed-by: Steven Whitehouse Signed-off-by: Sasha Levin --- 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 b0eee90738ff4..3b0debd066c96 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