Skip to content

Commit

Permalink
[GFS2] Use slab operations for all gfs2_bufdata allocations
Browse files Browse the repository at this point in the history
The old revoke structure was allocated using kalloc/kfree but
there is a slab cache for gfs2_bufdata, so we should use that
now that the structures have been converted.

This is part two of the patch series to merge the revoke
and gfs2_bufdata structures.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  • Loading branch information
Steven Whitehouse committed Oct 10, 2007
1 parent 82e8608 commit 0820ab5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion fs/gfs2/lops.c
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp)
}

*(__be64 *)(bh->b_data + offset) = cpu_to_be64(bd->bd_blkno);
kfree(bd);
kmem_cache_free(gfs2_bufdata_cachep, bd);

offset += sizeof(u64);
}
Expand Down
4 changes: 2 additions & 2 deletions fs/gfs2/trans.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ void gfs2_trans_add_bh(struct gfs2_glock *gl, struct buffer_head *bh, int meta)

void gfs2_trans_add_revoke(struct gfs2_sbd *sdp, u64 blkno)
{
struct gfs2_bufdata *bd = kmalloc(sizeof(struct gfs2_bufdata),
struct gfs2_bufdata *bd = kmem_cache_alloc(gfs2_bufdata_cachep,
GFP_NOFS | __GFP_NOFAIL);
lops_init_le(&bd->bd_le, &gfs2_revoke_lops);
bd->bd_blkno = blkno;
Expand Down Expand Up @@ -172,7 +172,7 @@ void gfs2_trans_add_unrevoke(struct gfs2_sbd *sdp, u64 blkno)

if (found) {
struct gfs2_trans *tr = current->journal_info;
kfree(bd);
kmem_cache_free(gfs2_bufdata_cachep, bd);
tr->tr_num_revoke_rm++;
}
}
Expand Down

0 comments on commit 0820ab5

Please sign in to comment.