From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Tue, 10 Jul 2018 09:28:52 -0400 (EDT) Subject: [Cluster-devel] [PATCH] gfs2: Fix gfs2_testbit to use clone bitmaps In-Reply-To: <1281000737.49168822.1531229160359.JavaMail.zimbra@redhat.com> Message-ID: <1944111320.49169682.1531229332655.JavaMail.zimbra@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, Function gfs2_testbit is called in three places. Two of those places, gfs2_alloc_extent and gfs2_unaligned_extlen, should be using the clone bitmaps, not the "real" bitmaps. Function gfs2_unaligned_extlen is used by the block reservations scheme to determine the length of an extent of free blocks. Before this patch, it wasn't using the clone bitmap, which means soon-to-be-freed blocks will be treated as free blocks for the purposes of an extent, and that's clearly wrong. Signed-off-by: Bob Peterson --- fs/gfs2/rgrp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index 3821b3ab04fa..b248e83f5525 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -130,10 +130,12 @@ static inline void gfs2_setbit(const struct gfs2_rbm *rbm, bool do_clone, static inline u8 gfs2_testbit(const struct gfs2_rbm *rbm) { struct gfs2_bitmap *bi = rbm_bi(rbm); - const u8 *buffer = bi->bi_bh->b_data + bi->bi_offset; + const u8 *buffer; const u8 *byte; unsigned int bit; + buffer = bi->bi_clone ? bi->bi_clone : bi->bi_bh->b_data; + buffer += bi->bi_offset; byte = buffer + (rbm->offset / GFS2_NBBY); bit = (rbm->offset % GFS2_NBBY) * GFS2_BIT_SIZE;