diff options
| author | Jan Kara <jack@suse.cz> | 2007-05-08 00:35:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 11:15:21 -0700 |
| commit | 3bf25cb40d899eeb5a471f497e56ddfe2c96c019 (patch) | |
| tree | 98d425edd6392d3037218851084dde6736e7ba32 /fs/udf/balloc.c | |
| parent | ff116fc8d1d43927c7651b91d5aec41eb30c4429 (diff) | |
udf: use get_bh()
Make UDF use get_bh() instead of directly accessing b_count and use
brelse() instead of udf_release_data() which does just brelse()...
Signed-off-by: Jan Kara <jack@suse.cz>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/udf/balloc.c')
| -rw-r--r-- | fs/udf/balloc.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index 756dbbf0eafd..4cec91015681 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c @@ -508,8 +508,8 @@ static void udf_table_free_blocks(struct super_block * sb, { i = -1; oepos.block = epos.block; - udf_release_data(oepos.bh); - atomic_inc(&epos.bh->b_count); + brelse(oepos.bh); + get_bh(epos.bh); oepos.bh = epos.bh; oepos.offset = 0; } @@ -546,8 +546,8 @@ static void udf_table_free_blocks(struct super_block * sb, adsize = sizeof(long_ad); else { - udf_release_data(oepos.bh); - udf_release_data(epos.bh); + brelse(oepos.bh); + brelse(epos.bh); goto error_return; } @@ -556,7 +556,7 @@ static void udf_table_free_blocks(struct super_block * sb, char *sptr, *dptr; int loffset; - udf_release_data(oepos.bh); + brelse(oepos.bh); oepos = epos; /* Steal a block from the extent being free'd */ @@ -567,7 +567,7 @@ static void udf_table_free_blocks(struct super_block * sb, if (!(epos.bh = udf_tread(sb, udf_get_lb_pblock(sb, epos.block, 0)))) { - udf_release_data(oepos.bh); + brelse(oepos.bh); goto error_return; } aed = (struct allocExtDesc *)(epos.bh->b_data); @@ -658,8 +658,8 @@ static void udf_table_free_blocks(struct super_block * sb, } } - udf_release_data(epos.bh); - udf_release_data(oepos.bh); + brelse(epos.bh); + brelse(oepos.bh); error_return: sb->s_dirt = 1; @@ -723,7 +723,7 @@ static int udf_table_prealloc_blocks(struct super_block * sb, else alloc_count = 0; - udf_release_data(epos.bh); + brelse(epos.bh); if (alloc_count && UDF_SB_LVIDBH(sb)) { @@ -789,9 +789,9 @@ static int udf_table_new_block(struct super_block * sb, spread = nspread; if (goal_epos.bh != epos.bh) { - udf_release_data(goal_epos.bh); + brelse(goal_epos.bh); goal_epos.bh = epos.bh; - atomic_inc(&goal_epos.bh->b_count); + get_bh(goal_epos.bh); } goal_epos.block = epos.block; goal_epos.offset = epos.offset - adsize; @@ -800,11 +800,11 @@ static int udf_table_new_block(struct super_block * sb, } } - udf_release_data(epos.bh); + brelse(epos.bh); if (spread == 0xFFFFFFFF) { - udf_release_data(goal_epos.bh); + brelse(goal_epos.bh); mutex_unlock(&sbi->s_alloc_mutex); return 0; } @@ -820,7 +820,7 @@ static int udf_table_new_block(struct super_block * sb, if (inode && DQUOT_ALLOC_BLOCK(inode, 1)) { - udf_release_data(goal_epos.bh); + brelse(goal_epos.bh); mutex_unlock(&sbi->s_alloc_mutex); *err = -EDQUOT; return 0; @@ -830,7 +830,7 @@ static int udf_table_new_block(struct super_block * sb, udf_write_aext(table, &goal_epos, goal_eloc, goal_elen, 1); else udf_delete_aext(table, goal_epos, goal_eloc, goal_elen); - udf_release_data(goal_epos.bh); + brelse(goal_epos.bh); if (UDF_SB_LVIDBH(sb)) { @@ -915,11 +915,14 @@ inline int udf_new_block(struct super_block * sb, struct inode * inode, uint16_t partition, uint32_t goal, int *err) { + int ret; + if (UDF_SB_PARTFLAGS(sb, partition) & UDF_PART_FLAG_UNALLOC_BITMAP) { - return udf_bitmap_new_block(sb, inode, + ret = udf_bitmap_new_block(sb, inode, UDF_SB_PARTMAPS(sb)[partition].s_uspace.s_bitmap, partition, goal, err); + return ret; } else if (UDF_SB_PARTFLAGS(sb, partition) & UDF_PART_FLAG_UNALLOC_TABLE) { |