From 04073513a59d0cbcaabf929cad7df33fa3d73af2 Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 1 Dec 2008 13:06:10 +0100 Subject: [PATCH] --- yaml --- r: 140011 b: refs/heads/master c: e650b94addfbf072952df762e6f1c6c9e26c4f9c h: refs/heads/master i: 140009: f3def4aae2976c35f2adbba253b6a1d8eeb54597 140007: 3c5d6075ae3b951eb82242824dd644a0b5ec81ae v: v3 --- [refs] | 2 +- trunk/fs/udf/balloc.c | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index a8308196ed4f..0d23c83247ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30930554f23511645ad9cfb89792219bf398b654 +refs/heads/master: e650b94addfbf072952df762e6f1c6c9e26c4f9c diff --git a/trunk/fs/udf/balloc.c b/trunk/fs/udf/balloc.c index 94d876a6d19a..58be702cb42d 100644 --- a/trunk/fs/udf/balloc.c +++ b/trunk/fs/udf/balloc.c @@ -840,23 +840,17 @@ void udf_free_blocks(struct super_block *sb, struct inode *inode, struct udf_part_map *map = &UDF_SB(sb)->s_partmaps[partition]; if (map->s_partition_flags & UDF_PART_FLAG_UNALLOC_BITMAP) { - return udf_bitmap_free_blocks(sb, inode, - map->s_uspace.s_bitmap, - bloc, offset, count); + udf_bitmap_free_blocks(sb, inode, map->s_uspace.s_bitmap, + bloc, offset, count); } else if (map->s_partition_flags & UDF_PART_FLAG_UNALLOC_TABLE) { - return udf_table_free_blocks(sb, inode, - map->s_uspace.s_table, - bloc, offset, count); + udf_table_free_blocks(sb, inode, map->s_uspace.s_table, + bloc, offset, count); } else if (map->s_partition_flags & UDF_PART_FLAG_FREED_BITMAP) { - return udf_bitmap_free_blocks(sb, inode, - map->s_fspace.s_bitmap, - bloc, offset, count); + udf_bitmap_free_blocks(sb, inode, map->s_fspace.s_bitmap, + bloc, offset, count); } else if (map->s_partition_flags & UDF_PART_FLAG_FREED_TABLE) { - return udf_table_free_blocks(sb, inode, - map->s_fspace.s_table, - bloc, offset, count); - } else { - return; + udf_table_free_blocks(sb, inode, map->s_fspace.s_table, + bloc, offset, count); } }