Skip to content

Commit 0ddeded

Browse files
Andreas GruenbacherAstralBob
Andreas Gruenbacher
authored and
AstralBob
committed
gfs2: Pass resource group to rgblk_free
Function rgblk_free can only deal with one resource group at a time, so pass that resource group is as a parameter. Several of the callers already have the resource group at hand, so we only need additional lookup code in a few places. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> Signed-off-by: Bob Peterson <rpeterso@redhat.com> Reviewed-by: Steven Whitehouse <swhiteho@redhat.com>
1 parent c3abc29 commit 0ddeded

File tree

5 files changed

+35
-40
lines changed

5 files changed

+35
-40
lines changed

‎fs/gfs2/bmap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,15 +1566,15 @@ static int sweep_bh_for_rgrps(struct gfs2_inode *ip, struct gfs2_holder *rd_gh,
15661566
continue;
15671567
}
15681568
if (bstart) {
1569-
__gfs2_free_blocks(ip, bstart, (u32)blen, meta);
1569+
__gfs2_free_blocks(ip, rgd, bstart, (u32)blen, meta);
15701570
(*btotal) += blen;
15711571
gfs2_add_inode_blocks(&ip->i_inode, -blen);
15721572
}
15731573
bstart = bn;
15741574
blen = 1;
15751575
}
15761576
if (bstart) {
1577-
__gfs2_free_blocks(ip, bstart, (u32)blen, meta);
1577+
__gfs2_free_blocks(ip, rgd, bstart, (u32)blen, meta);
15781578
(*btotal) += blen;
15791579
gfs2_add_inode_blocks(&ip->i_inode, -blen);
15801580
}

‎fs/gfs2/dir.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2042,6 +2042,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
20422042
bh = leaf_bh;
20432043

20442044
for (blk = leaf_no; blk; blk = nblk) {
2045+
struct gfs2_rgrpd *rgd;
2046+
20452047
if (blk != leaf_no) {
20462048
error = get_leaf(dip, blk, &bh);
20472049
if (error)
@@ -2052,7 +2054,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
20522054
if (blk != leaf_no)
20532055
brelse(bh);
20542056

2055-
gfs2_free_meta(dip, blk, 1);
2057+
rgd = gfs2_blk2rgrpd(sdp, blk, true);
2058+
gfs2_free_meta(dip, rgd, blk, 1);
20562059
gfs2_add_inode_blocks(&dip->i_inode, -1);
20572060
}
20582061

‎fs/gfs2/rgrp.c

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,28 +2215,21 @@ static void gfs2_alloc_extent(const struct gfs2_rbm *rbm, bool dinode,
22152215
/**
22162216
* rgblk_free - Change alloc state of given block(s)
22172217
* @sdp: the filesystem
2218+
* @rgd: the resource group the blocks are in
22182219
* @bstart: the start of a run of blocks to free
22192220
* @blen: the length of the block run (all must lie within ONE RG!)
22202221
* @new_state: GFS2_BLKST_XXX the after-allocation block state
2221-
*
2222-
* Returns: Resource group containing the block(s)
22232222
*/
22242223

2225-
static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart,
2226-
u32 blen, unsigned char new_state)
2224+
static void rgblk_free(struct gfs2_sbd *sdp, struct gfs2_rgrpd *rgd,
2225+
u64 bstart, u32 blen, unsigned char new_state)
22272226
{
22282227
struct gfs2_rbm rbm;
22292228
struct gfs2_bitmap *bi, *bi_prev = NULL;
22302229

2231-
rbm.rgd = gfs2_blk2rgrpd(sdp, bstart, 1);
2232-
if (!rbm.rgd) {
2233-
if (gfs2_consist(sdp))
2234-
fs_err(sdp, "block = %llu\n", (unsigned long long)bstart);
2235-
return NULL;
2236-
}
2237-
2230+
rbm.rgd = rgd;
22382231
if (WARN_ON_ONCE(gfs2_rbm_from_block(&rbm, bstart)))
2239-
return NULL;
2232+
return;
22402233
while (blen--) {
22412234
bi = rbm_bi(&rbm);
22422235
if (bi != bi_prev) {
@@ -2253,8 +2246,6 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, u64 bstart,
22532246
gfs2_setbit(&rbm, false, new_state);
22542247
gfs2_rbm_incr(&rbm);
22552248
}
2256-
2257-
return rbm.rgd;
22582249
}
22592250

22602251
/**
@@ -2470,20 +2461,19 @@ int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *nblocks,
24702461
/**
24712462
* __gfs2_free_blocks - free a contiguous run of block(s)
24722463
* @ip: the inode these blocks are being freed from
2464+
* @rgd: the resource group the blocks are in
24732465
* @bstart: first block of a run of contiguous blocks
24742466
* @blen: the length of the block run
24752467
* @meta: 1 if the blocks represent metadata
24762468
*
24772469
*/
24782470

2479-
void __gfs2_free_blocks(struct gfs2_inode *ip, u64 bstart, u32 blen, int meta)
2471+
void __gfs2_free_blocks(struct gfs2_inode *ip, struct gfs2_rgrpd *rgd,
2472+
u64 bstart, u32 blen, int meta)
24802473
{
24812474
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
2482-
struct gfs2_rgrpd *rgd;
24832475

2484-
rgd = rgblk_free(sdp, bstart, blen, GFS2_BLKST_FREE);
2485-
if (!rgd)
2486-
return;
2476+
rgblk_free(sdp, rgd, bstart, blen, GFS2_BLKST_FREE);
24872477
trace_gfs2_block_alloc(ip, rgd, bstart, blen, GFS2_BLKST_FREE);
24882478
rgd->rd_free += blen;
24892479
rgd->rd_flags &= ~GFS2_RGF_TRIMMED;
@@ -2498,16 +2488,18 @@ void __gfs2_free_blocks(struct gfs2_inode *ip, u64 bstart, u32 blen, int meta)
24982488
/**
24992489
* gfs2_free_meta - free a contiguous run of data block(s)
25002490
* @ip: the inode these blocks are being freed from
2491+
* @rgd: the resource group the blocks are in
25012492
* @bstart: first block of a run of contiguous blocks
25022493
* @blen: the length of the block run
25032494
*
25042495
*/
25052496

2506-
void gfs2_free_meta(struct gfs2_inode *ip, u64 bstart, u32 blen)
2497+
void gfs2_free_meta(struct gfs2_inode *ip, struct gfs2_rgrpd *rgd,
2498+
u64 bstart, u32 blen)
25072499
{
25082500
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
25092501

2510-
__gfs2_free_blocks(ip, bstart, blen, 1);
2502+
__gfs2_free_blocks(ip, rgd, bstart, blen, 1);
25112503
gfs2_statfs_change(sdp, 0, +blen, 0);
25122504
gfs2_quota_change(ip, -(s64)blen, ip->i_inode.i_uid, ip->i_inode.i_gid);
25132505
}
@@ -2519,9 +2511,10 @@ void gfs2_unlink_di(struct inode *inode)
25192511
struct gfs2_rgrpd *rgd;
25202512
u64 blkno = ip->i_no_addr;
25212513

2522-
rgd = rgblk_free(sdp, blkno, 1, GFS2_BLKST_UNLINKED);
2514+
rgd = gfs2_blk2rgrpd(sdp, blkno, true);
25232515
if (!rgd)
25242516
return;
2517+
rgblk_free(sdp, rgd, blkno, 1, GFS2_BLKST_UNLINKED);
25252518
trace_gfs2_block_alloc(ip, rgd, blkno, 1, GFS2_BLKST_UNLINKED);
25262519
gfs2_trans_add_meta(rgd->rd_gl, rgd->rd_bits[0].bi_bh);
25272520
gfs2_rgrp_out(rgd, rgd->rd_bits[0].bi_bh->b_data);
@@ -2531,13 +2524,8 @@ void gfs2_unlink_di(struct inode *inode)
25312524
void gfs2_free_di(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip)
25322525
{
25332526
struct gfs2_sbd *sdp = rgd->rd_sbd;
2534-
struct gfs2_rgrpd *tmp_rgd;
2535-
2536-
tmp_rgd = rgblk_free(sdp, ip->i_no_addr, 1, GFS2_BLKST_FREE);
2537-
if (!tmp_rgd)
2538-
return;
2539-
gfs2_assert_withdraw(sdp, rgd == tmp_rgd);
25402527

2528+
rgblk_free(sdp, rgd, ip->i_no_addr, 1, GFS2_BLKST_FREE);
25412529
if (!rgd->rd_dinodes)
25422530
gfs2_consist_rgrpd(rgd);
25432531
rgd->rd_dinodes--;

‎fs/gfs2/rgrp.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ extern int gfs2_alloc_blocks(struct gfs2_inode *ip, u64 *bn, unsigned int *n,
5151
extern int gfs2_rsqa_alloc(struct gfs2_inode *ip);
5252
extern void gfs2_rs_deltree(struct gfs2_blkreserv *rs);
5353
extern void gfs2_rsqa_delete(struct gfs2_inode *ip, atomic_t *wcount);
54-
extern void __gfs2_free_blocks(struct gfs2_inode *ip, u64 bstart, u32 blen, int meta);
55-
extern void gfs2_free_meta(struct gfs2_inode *ip, u64 bstart, u32 blen);
54+
extern void __gfs2_free_blocks(struct gfs2_inode *ip, struct gfs2_rgrpd *rgd,
55+
u64 bstart, u32 blen, int meta);
56+
extern void gfs2_free_meta(struct gfs2_inode *ip, struct gfs2_rgrpd *rgd,
57+
u64 bstart, u32 blen);
5658
extern void gfs2_free_di(struct gfs2_rgrpd *rgd, struct gfs2_inode *ip);
5759
extern void gfs2_unlink_di(struct inode *inode);
5860
extern int gfs2_check_blk_type(struct gfs2_sbd *sdp, u64 no_addr,

‎fs/gfs2/xattr.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
283283
blen++;
284284
else {
285285
if (bstart)
286-
gfs2_free_meta(ip, bstart, blen);
286+
gfs2_free_meta(ip, rgd, bstart, blen);
287287
bstart = bn;
288288
blen = 1;
289289
}
@@ -292,7 +292,7 @@ static int ea_dealloc_unstuffed(struct gfs2_inode *ip, struct buffer_head *bh,
292292
gfs2_add_inode_blocks(&ip->i_inode, -1);
293293
}
294294
if (bstart)
295-
gfs2_free_meta(ip, bstart, blen);
295+
gfs2_free_meta(ip, rgd, bstart, blen);
296296

297297
if (prev && !leave) {
298298
u32 len;
@@ -1250,6 +1250,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
12501250
{
12511251
struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
12521252
struct gfs2_rgrp_list rlist;
1253+
struct gfs2_rgrpd *rgd;
12531254
struct buffer_head *indbh, *dibh;
12541255
__be64 *eablk, *end;
12551256
unsigned int rg_blocks = 0;
@@ -1302,8 +1303,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
13021303
gfs2_rlist_alloc(&rlist);
13031304

13041305
for (x = 0; x < rlist.rl_rgrps; x++) {
1305-
struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(rlist.rl_ghs[x].gh_gl);
1306-
1306+
rgd = gfs2_glock2rgrp(rlist.rl_ghs[x].gh_gl);
13071307
rg_blocks += rgd->rd_length;
13081308
}
13091309

@@ -1320,6 +1320,7 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
13201320

13211321
eablk = (__be64 *)(indbh->b_data + sizeof(struct gfs2_meta_header));
13221322
bstart = 0;
1323+
rgd = NULL;
13231324
blen = 0;
13241325

13251326
for (; eablk < end; eablk++) {
@@ -1333,16 +1334,17 @@ static int ea_dealloc_indirect(struct gfs2_inode *ip)
13331334
blen++;
13341335
else {
13351336
if (bstart)
1336-
gfs2_free_meta(ip, bstart, blen);
1337+
gfs2_free_meta(ip, rgd, bstart, blen);
13371338
bstart = bn;
1339+
rgd = gfs2_blk2rgrpd(sdp, bstart, true);
13381340
blen = 1;
13391341
}
13401342

13411343
*eablk = 0;
13421344
gfs2_add_inode_blocks(&ip->i_inode, -1);
13431345
}
13441346
if (bstart)
1345-
gfs2_free_meta(ip, bstart, blen);
1347+
gfs2_free_meta(ip, rgd, bstart, blen);
13461348

13471349
ip->i_diskflags &= ~GFS2_DIF_EA_INDIRECT;
13481350

@@ -1391,7 +1393,7 @@ static int ea_dealloc_block(struct gfs2_inode *ip)
13911393
if (error)
13921394
goto out_gunlock;
13931395

1394-
gfs2_free_meta(ip, ip->i_eattr, 1);
1396+
gfs2_free_meta(ip, rgd, ip->i_eattr, 1);
13951397

13961398
ip->i_eattr = 0;
13971399
gfs2_add_inode_blocks(&ip->i_inode, -1);

0 commit comments

Comments
 (0)