xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: clean up NULL checks in qgroup_unreserve_range()

Browse Source 
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>
This commit is contained in:
Dan Carpenter
2020-10-23 14:26:33 +03:00
committed by David Sterba
parent fca3a45d08
commit f07728d541
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/qgroup.c
View File

@@ -3435,24 +3435,20 @@ static int qgroup_unreserve_range(struct btrfs_inode *inode,
{ {
struct rb_node *node; struct rb_node *node;
struct rb_node *next; struct rb_node *next;
struct ulist_node *entry = NULL; struct ulist_node *entry;
int ret = 0; int ret = 0;
node = reserved->range_changed.root.rb_node; node = reserved->range_changed.root.rb_node;
if (!node)
return 0;
while (node) { while (node) {
entry = rb_entry(node, struct ulist_node, rb_node); entry = rb_entry(node, struct ulist_node, rb_node);
if (entry->val < start) if (entry->val < start)
node = node->rb_right; node = node->rb_right;
else if (entry)
node = node->rb_left;
else else
break; node = node->rb_left;
} }
/* Empty changeset */
if (!entry)
return 0;
if (entry->val > start && rb_prev(&entry->rb_node)) if (entry->val > start && rb_prev(&entry->rb_node))
entry = rb_entry(rb_prev(&entry->rb_node), struct ulist_node, entry = rb_entry(rb_prev(&entry->rb_node), struct ulist_node,
rb_node); rb_node);