Commit b8eeab7f authored Dec 17, 2018 by Nikolay Borisov Committed by David Sterba Feb 25, 2019

btrfs: Consolidate retval checking of core btree functions



Core btree functions in btrfs generally return 0 when an item is found,
1 in case the sought item cannot be found and <0 when an error happens.
Consolidate the checks for those conditions in one 'if () {} else if ()
{}' construct rather than 2 separate 'if () {}' statements. This
emphasizes that the handling code pertains to a single function. No
functional changes.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 694c12ed

fs/btrfs/inode.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -6795,9 +6795,7 @@ struct extent_map btrfs_get_extent(struct btrfs_inode inode,
		if (ret < 0) {
		err = ret;
		goto out;
		}

		if (ret != 0) {
		} else if (ret > 0) {
		if (path->slots[0] == 0)
		goto not_found;
		path->slots[0]--;
		@@ -6847,9 +6845,9 @@ next:
		if (ret < 0) {
		err = ret;
		goto out;
		}
		if (ret > 0)
		} else if (ret > 0) {
		goto not_found;
		}
		leaf = path->nodes[0];
		}
		btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);

Admin message