diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2008-02-08 12:20:34 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 17:22:35 (GMT) |
| commit | 883cb9d1842a37c6eed77f2c64792d35048c1e8d (patch) | |
| tree | e0c95015c8721868dab0d060385aec18164718a6 | |
| parent | 66e1da3f47d5aaa278d116e72d2f8e8f204cdca3 (diff) | |
| download | linux-883cb9d1842a37c6eed77f2c64792d35048c1e8d.tar.xz | |
udf: move calculating of nr_groups into helper function
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Ben Fennema <bfennema@falcon.csc.calpoly.edu>
Acked-by: Jan Kara <jack@suse.cz>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/udf/balloc.c | 4 | ||||
| -rw-r--r-- | fs/udf/super.c | 16 | ||||
| -rw-r--r-- | fs/udf/udf_sb.h | 2 |
3 files changed, 13 insertions, 9 deletions
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index 8c0c279..3f67d9d 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c @@ -231,9 +231,7 @@ static int udf_bitmap_prealloc_blocks(struct super_block *sb, block_count = part_len - first_block; repeat: - nr_groups = (sbi->s_partmaps[partition].s_partition_len + - (sizeof(struct spaceBitmapDesc) << 3) + - (sb->s_blocksize * 8) - 1) / (sb->s_blocksize * 8); + nr_groups = udf_compute_nr_groups(sb, partition); block = first_block + (sizeof(struct spaceBitmapDesc) << 3); block_group = block >> (sb->s_blocksize_bits + 3); group_start = block_group ? 0 : sizeof(struct spaceBitmapDesc); diff --git a/fs/udf/super.c b/fs/udf/super.c index 86aa223..c19ee38 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -937,18 +937,22 @@ static void udf_load_fileset(struct super_block *sb, struct buffer_head *bh, root->logicalBlockNum, root->partitionReferenceNum); } +int udf_compute_nr_groups(struct super_block *sb, u32 partition) +{ + struct udf_part_map *map = &UDF_SB(sb)->s_partmaps[partition]; + return (map->s_partition_len + + (sizeof(struct spaceBitmapDesc) << 3) + + (sb->s_blocksize * 8) - 1) / + (sb->s_blocksize * 8); +} + static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index) { - struct udf_part_map *map = &UDF_SB(sb)->s_partmaps[index]; struct udf_bitmap *bitmap; int nr_groups; int size; - /* TODO: move calculating of nr_groups into helper function */ - nr_groups = (map->s_partition_len + - (sizeof(struct spaceBitmapDesc) << 3) + - (sb->s_blocksize * 8) - 1) / - (sb->s_blocksize * 8); + nr_groups = udf_compute_nr_groups(sb, index); size = sizeof(struct udf_bitmap) + (sizeof(struct buffer_head *) * nr_groups); diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h index 2c05f82..d9adb0f 100644 --- a/fs/udf/udf_sb.h +++ b/fs/udf/udf_sb.h @@ -43,6 +43,8 @@ static inline struct udf_sb_info *UDF_SB(struct super_block *sb) struct logicalVolIntegrityDescImpUse *udf_sb_lvidiu(struct udf_sb_info *sbi); +int udf_compute_nr_groups(struct super_block *sb, u32 partition); + #define UDF_QUERY_FLAG(X,Y) ( UDF_SB(X)->s_flags & ( 1 << (Y) ) ) #define UDF_SET_FLAG(X,Y) ( UDF_SB(X)->s_flags |= ( 1 << (Y) ) ) #define UDF_CLEAR_FLAG(X,Y) ( UDF_SB(X)->s_flags &= ~( 1 << (Y) ) ) |