[PATCH] udf: remove redundant tests on unsigned

[PATCH] udf: remove redundant tests on unsigned

[Roel Kluin]

first_block and goal are unsigned. When negative they are wrapped and caught by
the other test.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index e48e9a3..1e06853 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -238,7 +238,7 @@ static int udf_bitmap_prealloc_blocks(struct super_block *sb,
 
 	mutex_lock(&sbi->s_alloc_mutex);
 	part_len = sbi->s_partmaps[partition].s_partition_len;
-	if (first_block < 0 || first_block >= part_len)
+	if (first_block >= part_len)
 		goto out;
 
 	if (first_block + block_count > part_len)
@@ -297,7 +297,7 @@ static int udf_bitmap_new_block(struct super_block *sb,
 	mutex_lock(&sbi->s_alloc_mutex);
 
 repeat:
-	if (goal < 0 || goal >= sbi->s_partmaps[partition].s_partition_len)
+	if (goal >= sbi->s_partmaps[partition].s_partition_len)
 		goal = 0;
 
 	nr_groups = bitmap->s_nr_groups;
@@ -666,8 +666,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
 	int8_t etype = -1;
 	struct udf_inode_info *iinfo;
 
-	if (first_block < 0 ||
-		first_block >= sbi->s_partmaps[partition].s_partition_len)
+	if (first_block >= sbi->s_partmaps[partition].s_partition_len)
 		return 0;
 
 	iinfo = UDF_I(table);
@@ -743,7 +742,7 @@ static int udf_table_new_block(struct super_block *sb,
 		return newblock;
 
 	mutex_lock(&sbi->s_alloc_mutex);
-	if (goal < 0 || goal >= sbi->s_partmaps[partition].s_partition_len)
+	if (goal >= sbi->s_partmaps[partition].s_partition_len)
 		goal = 0;
 
 	/* We search for the closest matching block to goal. If we find

Re: [PATCH] udf: remove redundant tests on unsigned

[Jan Kara]

On Mon 22-06-09 23:12:29, Roel Kluin wrote:
> first_block and goal are unsigned. When negative they are wrapped and caught by
> the other test.
> 
> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
  Thanks for the patch. I've merged it in UDF tree.

									Honza

> ---
> diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
> index e48e9a3..1e06853 100644
> --- a/fs/udf/balloc.c
> +++ b/fs/udf/balloc.c
> @@ -238,7 +238,7 @@ static int udf_bitmap_prealloc_blocks(struct super_block *sb,
>  
>  	mutex_lock(&sbi->s_alloc_mutex);
>  	part_len = sbi->s_partmaps[partition].s_partition_len;
> -	if (first_block < 0 || first_block >= part_len)
> +	if (first_block >= part_len)
>  		goto out;
>  
>  	if (first_block + block_count > part_len)
> @@ -297,7 +297,7 @@ static int udf_bitmap_new_block(struct super_block *sb,
>  	mutex_lock(&sbi->s_alloc_mutex);
>  
>  repeat:
> -	if (goal < 0 || goal >= sbi->s_partmaps[partition].s_partition_len)
> +	if (goal >= sbi->s_partmaps[partition].s_partition_len)
>  		goal = 0;
>  
>  	nr_groups = bitmap->s_nr_groups;
> @@ -666,8 +666,7 @@ static int udf_table_prealloc_blocks(struct super_block *sb,
>  	int8_t etype = -1;
>  	struct udf_inode_info *iinfo;
>  
> -	if (first_block < 0 ||
> -		first_block >= sbi->s_partmaps[partition].s_partition_len)
> +	if (first_block >= sbi->s_partmaps[partition].s_partition_len)
>  		return 0;
>  
>  	iinfo = UDF_I(table);
> @@ -743,7 +742,7 @@ static int udf_table_new_block(struct super_block *sb,
>  		return newblock;
>  
>  	mutex_lock(&sbi->s_alloc_mutex);
> -	if (goal < 0 || goal >= sbi->s_partmaps[partition].s_partition_len)
> +	if (goal >= sbi->s_partmaps[partition].s_partition_len)
>  		goal = 0;
>  
>  	/* We search for the closest matching block to goal. If we find
-- 
Jan Kara <jack@suse.cz>
SUSE Labs, CR