On Mon, Dec 1, 2008 at 1:09 PM, Jan Kara <jack@xxxxxxx> wrote:
> On Thu 27-11-08 23:12:55, Hannes Eder wrote:
>> Fix this sparse warnings:
>>
>> fs/udf/balloc.c:843:3: warning: returning void-valued expression
>> fs/udf/balloc.c:847:3: warning: returning void-valued expression
>> fs/udf/balloc.c:851:3: warning: returning void-valued expression
>> fs/udf/balloc.c:855:3: warning: returning void-valued expression
>>
>> Signed-off-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
> Thanks for the patch. But when we are at it, I'd rather go for the
> following change:
>
> From f3facf9a4a60bba9f1fa0c779fc441c6aff90eb4 Mon Sep 17 00:00:00 2001
> From: Jan Kara <jack@xxxxxxx>
> Date: Mon, 1 Dec 2008 13:06:10 +0100
> Subject: [PATCH] udf: fix sparse warnings:
>
> Fix sparse warnings:
>
> fs/udf/balloc.c:843:3: warning: returning void-valued expression
> fs/udf/balloc.c:847:3: warning: returning void-valued expression
> fs/udf/balloc.c:851:3: warning: returning void-valued expression
> fs/udf/balloc.c:855:3: warning: returning void-valued expression
>
> Reported-by: Hannes Eder <hannes@xxxxxxxxxxxxxx>
> Signed-off-by: Jan Kara <jack@xxxxxxx>
> ---
> fs/udf/balloc.c | 23 +++++++++--------------
> 1 files changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
> index c0e87db..cde1a0d 100644
> --- a/fs/udf/balloc.c
> +++ b/fs/udf/balloc.c
> @@ -840,24 +840,19 @@ 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);
> }
> + return;
> }
>
> inline int udf_prealloc_blocks(struct super_block *sb,
> --
> 1.6.0.4
I prefer your version. I though about it as well, but then tried to
do kind of 'minimal change' patch, and leave the control flow as is.
Hannes
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
