diff --git a/[refs] b/[refs] index d05a132e9f99..b63a8b5a8504 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15aebd2866b21a568d8defec134bf29f9aea9088 +refs/heads/master: 8dee00bb758f9e1d7fac9f5d2463d09444d4f255 diff --git a/trunk/fs/udf/super.c b/trunk/fs/udf/super.c index 02815e92553b..5f0d400385e0 100644 --- a/trunk/fs/udf/super.c +++ b/trunk/fs/udf/super.c @@ -986,10 +986,9 @@ static void udf_load_fileset(struct super_block *sb, struct buffer_head *bh, 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); + return DIV_ROUND_UP(map->s_partition_len + + (sizeof(struct spaceBitmapDesc) << 3), + sb->s_blocksize * 8); } static struct udf_bitmap *udf_sb_alloc_bitmap(struct super_block *sb, u32 index)