Re: [PATCH 3/5 linux-next] udf: remove else after return in __load_block_bitmap()

[Jan Kara]

On Tue 10-03-15 21:44:33, Fabian Frederick wrote:
> else after return is not needed.
  Thanks. Applied to my tree.

Honza

> 
> Signed-off-by: Fabian Frederick 
> ---
>  fs/udf/balloc.c | 15 +++
>  1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
> index 30f4641..1cd8916 100644
> --- a/fs/udf/balloc.c
> +++ b/fs/udf/balloc.c
> @@ -63,15 +63,14 @@ static int __load_block_bitmap(struct super_block *sb,
> block_group, nr_groups);
>   }
>  
> - if (bitmap->s_block_bitmap[block_group]) {
> + if (bitmap->s_block_bitmap[block_group])
>   return block_group;
> - } else {
> - retval = read_block_bitmap(sb, bitmap, block_group,
> -block_group);
> - if (retval < 0)
> - return retval;
> - return block_group;
> - }
> +
> + retval = read_block_bitmap(sb, bitmap, block_group, block_group);
> + if (retval < 0)
> + return retval;
> +
> + return block_group;
>  }
>  
>  static inline int load_block_bitmap(struct super_block *sb,
> -- 
> 1.9.1
> 
-- 
Jan Kara 
SUSE Labs, CR
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 3/5 linux-next] udf: remove else after return in __load_block_bitmap()

[Jan Kara]

On Tue 10-03-15 21:44:33, Fabian Frederick wrote:
 else after return is not needed.
  Thanks. Applied to my tree.

Honza

 
 Signed-off-by: Fabian Frederick f...@skynet.be
 ---
  fs/udf/balloc.c | 15 +++
  1 file changed, 7 insertions(+), 8 deletions(-)
 
 diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
 index 30f4641..1cd8916 100644
 --- a/fs/udf/balloc.c
 +++ b/fs/udf/balloc.c
 @@ -63,15 +63,14 @@ static int __load_block_bitmap(struct super_block *sb,
 block_group, nr_groups);
   }
  
 - if (bitmap-s_block_bitmap[block_group]) {
 + if (bitmap-s_block_bitmap[block_group])
   return block_group;
 - } else {
 - retval = read_block_bitmap(sb, bitmap, block_group,
 -block_group);
 - if (retval  0)
 - return retval;
 - return block_group;
 - }
 +
 + retval = read_block_bitmap(sb, bitmap, block_group, block_group);
 + if (retval  0)
 + return retval;
 +
 + return block_group;
  }
  
  static inline int load_block_bitmap(struct super_block *sb,
 -- 
 1.9.1
 
-- 
Jan Kara j...@suse.cz
SUSE Labs, CR
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 3/5 linux-next] udf: remove else after return in __load_block_bitmap()

[Fabian Frederick]

else after return is not needed.

Signed-off-by: Fabian Frederick 
---
 fs/udf/balloc.c | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 30f4641..1cd8916 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -63,15 +63,14 @@ static int __load_block_bitmap(struct super_block *sb,
  block_group, nr_groups);
}
 
-   if (bitmap->s_block_bitmap[block_group]) {
+   if (bitmap->s_block_bitmap[block_group])
return block_group;
-   } else {
-   retval = read_block_bitmap(sb, bitmap, block_group,
-  block_group);
-   if (retval < 0)
-   return retval;
-   return block_group;
-   }
+
+   retval = read_block_bitmap(sb, bitmap, block_group, block_group);
+   if (retval < 0)
+   return retval;
+
+   return block_group;
 }
 
 static inline int load_block_bitmap(struct super_block *sb,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 3/5 linux-next] udf: remove else after return in __load_block_bitmap()

[Fabian Frederick]

else after return is not needed.

Signed-off-by: Fabian Frederick f...@skynet.be
---
 fs/udf/balloc.c | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 30f4641..1cd8916 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -63,15 +63,14 @@ static int __load_block_bitmap(struct super_block *sb,
  block_group, nr_groups);
}
 
-   if (bitmap-s_block_bitmap[block_group]) {
+   if (bitmap-s_block_bitmap[block_group])
return block_group;
-   } else {
-   retval = read_block_bitmap(sb, bitmap, block_group,
-  block_group);
-   if (retval  0)
-   return retval;
-   return block_group;
-   }
+
+   retval = read_block_bitmap(sb, bitmap, block_group, block_group);
+   if (retval  0)
+   return retval;
+
+   return block_group;
 }
 
 static inline int load_block_bitmap(struct super_block *sb,
-- 
1.9.1

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/