[1/1] btrfs: fix improper return value
diff mbox

Message ID 1480827113-3928-1-git-send-email-bianpan2016@163.com
State New
Headers show

Commit Message

Pan Bian Dec. 4, 2016, 4:51 a.m. UTC
In function btrfs_uuid_tree_iterate(), errno is assigned to variable ret
on errors. However, it directly returns 0. It may be better to return
ret. This patch also removes the warning, because the caller already
prints a warning.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188731
Signed-off-by: Pan Bian <bianpan2016@163.com>
---
 fs/btrfs/uuid-tree.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Omar Sandoval Dec. 4, 2016, 7:57 p.m. UTC | #1
On Sun, Dec 04, 2016 at 12:51:53PM +0800, Pan Bian wrote:
> In function btrfs_uuid_tree_iterate(), errno is assigned to variable ret
> on errors. However, it directly returns 0. It may be better to return
> ret. This patch also removes the warning, because the caller already
> prints a warning.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188731

Looks good.

Reviewed-by: Omar Sandoval <osandov@fb.com>

> Signed-off-by: Pan Bian <bianpan2016@163.com>
> ---
>  fs/btrfs/uuid-tree.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/fs/btrfs/uuid-tree.c b/fs/btrfs/uuid-tree.c
> index 7fc89e4..83bb2f2 100644
> --- a/fs/btrfs/uuid-tree.c
> +++ b/fs/btrfs/uuid-tree.c
> @@ -351,7 +351,5 @@ int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info,
>  
>  out:
>  	btrfs_free_path(path);
> -	if (ret)
> -		btrfs_warn(fs_info, "btrfs_uuid_tree_iterate failed %d", ret);
> -	return 0;
> +	return ret;
>  }
> -- 
> 1.9.1
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Sterba Dec. 12, 2016, 1:38 p.m. UTC | #2
On Sun, Dec 04, 2016 at 11:57:07AM -0800, Omar Sandoval wrote:
> On Sun, Dec 04, 2016 at 12:51:53PM +0800, Pan Bian wrote:
> > In function btrfs_uuid_tree_iterate(), errno is assigned to variable ret
> > on errors. However, it directly returns 0. It may be better to return
> > ret. This patch also removes the warning, because the caller already
> > prints a warning.
> > 
> > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188731
> 
> Looks good.
> 
> Reviewed-by: Omar Sandoval <osandov@fb.com>

Added to 4.10 queue.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/fs/btrfs/uuid-tree.c b/fs/btrfs/uuid-tree.c
index 7fc89e4..83bb2f2 100644
--- a/fs/btrfs/uuid-tree.c
+++ b/fs/btrfs/uuid-tree.c
@@ -351,7 +351,5 @@  int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info,
 
 out:
 	btrfs_free_path(path);
-	if (ret)
-		btrfs_warn(fs_info, "btrfs_uuid_tree_iterate failed %d", ret);
-	return 0;
+	return ret;
 }