mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-07-19 14:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: remove scoutfs_buddy_dirty

Browse Source 
The buffer head rewrite got rid of the only caller who needed to ensure
that a free couldn't fail.  Let's get rid of this.  We can always bring
it back if it's needed again.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2016-08-01 11:31:13 -07:00
parent 7b18bce2e2
commit 8bc2b15e3d
2 changed files with 0 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/buddy.c
-83
View File
@@ -594,89 +594,6 @@ int scoutfs_buddy_alloc(struct super_block *sb, u64 *blkno, int order)
return alloc_region(sb, blkno, order, 0, REGION_BUDDY);
}
static int bitmap_dirty(struct super_block *sb, u64 blkno)
{
struct scoutfs_sb_info *sbi = SCOUTFS_SB(sb);
struct buffer_head *bh;
/* mkfs should have ensured that there's bitmap blocks */
/* XXX corruption */
if (sbi->super.buddy_bm_ref.blkno == 0)
return -EIO;
/* dirty the bitmap block */
bh = scoutfs_block_dirty_ref(sb, &sbi->super.buddy_bm_ref);
if (IS_ERR(bh))
return PTR_ERR(bh);
scoutfs_block_put(bh);
return 0;
}
static int buddy_dirty(struct super_block *sb, u64 blkno, int order)
{
struct scoutfs_sb_info *sbi = SCOUTFS_SB(sb);
struct scoutfs_super_block *super = &sbi->super;
struct scoutfs_buddy_indirect *ind;
struct buffer_head *ind_bh = NULL;
struct buffer_head *bh = NULL;
int ret;
int sl;
mutex_lock(&sbi->buddy_mutex);
/* mkfs should have ensured that there's indirect blocks */
if (sbi->super.buddy_ind_ref.blkno == 0) {
ret = -EIO;
goto out;
}
/* get the dirty indirect block */
ind_bh = scoutfs_block_dirty_ref(sb, &sbi->super.buddy_ind_ref);
if (IS_ERR(ind_bh)) {
ret = PTR_ERR(ind_bh);
goto out;
}
ind = bh_data(ind_bh);
sl = indirect_slot(super, blkno);
bh = dirty_buddy_block(sb, sl, &ind->slots[sl]);
if (IS_ERR(bh))
ret = PTR_ERR(bh);
else
ret = 0;
out:
mutex_unlock(&sbi->buddy_mutex);
scoutfs_block_put(ind_bh);
scoutfs_block_put(bh);
return ret;
}
/*
* Create dirty cow copies of the bitmap, indirect, and buddy blocks
* so that a free of the given extent in the current transaction is
* guaranteed to succeed.
*
* This is only meant for buddy allocators who are complicated enough
* to need help avoiding error conditions.
*/
int scoutfs_buddy_dirty(struct super_block *sb, u64 blkno, int order)
{
struct scoutfs_sb_info *sbi = SCOUTFS_SB(sb);
struct scoutfs_super_block *super = &sbi->super;
switch(blkno_region(super, blkno)) {
case REGION_BM:
return bitmap_dirty(sb, blkno);
case REGION_BUDDY:
return buddy_dirty(sb, blkno, order);
}
return 0;
}
/*
* The block layer allocates from the same region as an existing blkno
* when it's allocating for cow.
kmod/src/buddy.h
-1
View File
@@ -4,7 +4,6 @@
int scoutfs_buddy_alloc(struct super_block *sb, u64 *blkno, int order);
int scoutfs_buddy_alloc_same(struct super_block *sb, u64 *blkno, int order,
u64 existing);
int scoutfs_buddy_dirty(struct super_block *sb, u64 blkno, int order);
int scoutfs_buddy_free(struct super_block *sb, u64 blkno, int order);
#endif