From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from aserp1040.oracle.com ([141.146.126.69]:36813 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932293AbdJRHhu (ORCPT ); Wed, 18 Oct 2017 03:37:50 -0400 Date: Wed, 18 Oct 2017 10:36:35 +0300 From: Dan Carpenter To: Chris Mason , Josef Bacik Cc: David Sterba , linux-btrfs@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] Btrfs: ref-verify: Fix NULL vs IS_ERR() check in walk_down_tree() Message-ID: <20171018073635.cajusx7hzkg4ghgc@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-btrfs-owner@vger.kernel.org List-ID: read_tree_block() returns error pointers, and never NULL and so I have updated the error handling. Fixes: 74739121b4c7 ("Btrfs: add a extent ref verify tool") Signed-off-by: Dan Carpenter diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c index f65d78cf3c7e..34878699d363 100644 --- a/fs/btrfs/ref-verify.c +++ b/fs/btrfs/ref-verify.c @@ -584,7 +584,9 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path, gen = btrfs_node_ptr_generation(path->nodes[level], path->slots[level]); eb = read_tree_block(fs_info, block_bytenr, gen); - if (!eb || !extent_buffer_uptodate(eb)) { + if (IS_ERR(eb)) + return PTR_ERR(eb); + if (!extent_buffer_uptodate(eb)) { free_extent_buffer(eb); return -EIO; } From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Wed, 18 Oct 2017 07:36:35 +0000 Subject: [PATCH] Btrfs: ref-verify: Fix NULL vs IS_ERR() check in walk_down_tree() Message-Id: <20171018073635.cajusx7hzkg4ghgc@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Chris Mason , Josef Bacik Cc: David Sterba , linux-btrfs@vger.kernel.org, kernel-janitors@vger.kernel.org read_tree_block() returns error pointers, and never NULL and so I have updated the error handling. Fixes: 74739121b4c7 ("Btrfs: add a extent ref verify tool") Signed-off-by: Dan Carpenter diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c index f65d78cf3c7e..34878699d363 100644 --- a/fs/btrfs/ref-verify.c +++ b/fs/btrfs/ref-verify.c @@ -584,7 +584,9 @@ static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path, gen = btrfs_node_ptr_generation(path->nodes[level], path->slots[level]); eb = read_tree_block(fs_info, block_bytenr, gen); - if (!eb || !extent_buffer_uptodate(eb)) { + if (IS_ERR(eb)) + return PTR_ERR(eb); + if (!extent_buffer_uptodate(eb)) { free_extent_buffer(eb); return -EIO; }