diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2020-10-23 14:26:33 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2020-11-05 13:02:20 +0100 |
| commit | f07728d541ebefcf3d2ec7bc99a3bffd052d9f90 (patch) | |
| tree | 7b1e6c682ee89e4f751c2d77c43eeeb1cf85e5c0 /fs/btrfs/qgroup.c | |
| parent | fca3a45d08782a2bb85e048fb8e3128b1388d7b7 (diff) | |
| download | linux-f07728d541ebefcf3d2ec7bc99a3bffd052d9f90.tar.bz2 | |
btrfs: clean up NULL checks in qgroup_unreserve_range()
Smatch complains that this code dereferences "entry" before checking
whether it's NULL on the next line. Fortunately, rb_entry() will never
return NULL so it doesn't cause a problem. We can clean up the NULL
checking a bit to silence the warning and make the code more clear.
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/qgroup.c')
| -rw-r--r-- | fs/btrfs/qgroup.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index c54ea6586632..77c54749f432 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -3435,24 +3435,20 @@ static int qgroup_unreserve_range(struct btrfs_inode *inode, { struct rb_node *node; struct rb_node *next; - struct ulist_node *entry = NULL; + struct ulist_node *entry; int ret = 0; node = reserved->range_changed.root.rb_node; + if (!node) + return 0; while (node) { entry = rb_entry(node, struct ulist_node, rb_node); if (entry->val < start) node = node->rb_right; - else if (entry) - node = node->rb_left; else - break; + node = node->rb_left; } - /* Empty changeset */ - if (!entry) - return 0; - if (entry->val > start && rb_prev(&entry->rb_node)) entry = rb_entry(rb_prev(&entry->rb_node), struct ulist_node, rb_node); |