Commit 20a42d08 authored by Dean Luick's avatar Dean Luick Committed by Doug Ledford

IB/hfi1: Remove unneeded empty check in hfi1_mmu_rb_unregister()

Checking if the rb tree is empty is redundant with the while loop which is
emptying the rb tree.
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDean Luick <dean.luick@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent ea3a0ee5
...@@ -118,6 +118,8 @@ int hfi1_mmu_rb_register(struct rb_root *root, struct mmu_rb_ops *ops) ...@@ -118,6 +118,8 @@ int hfi1_mmu_rb_register(struct rb_root *root, struct mmu_rb_ops *ops)
void hfi1_mmu_rb_unregister(struct rb_root *root) void hfi1_mmu_rb_unregister(struct rb_root *root)
{ {
struct mmu_rb_handler *handler = find_mmu_handler(root); struct mmu_rb_handler *handler = find_mmu_handler(root);
struct mmu_rb_node *rbnode;
struct rb_node *node;
unsigned long flags; unsigned long flags;
if (!handler) if (!handler)
...@@ -133,15 +135,10 @@ void hfi1_mmu_rb_unregister(struct rb_root *root) ...@@ -133,15 +135,10 @@ void hfi1_mmu_rb_unregister(struct rb_root *root)
synchronize_rcu(); synchronize_rcu();
spin_lock_irqsave(&handler->lock, flags); spin_lock_irqsave(&handler->lock, flags);
if (!RB_EMPTY_ROOT(root)) { while ((node = rb_first(root))) {
struct rb_node *node; rbnode = rb_entry(node, struct mmu_rb_node, node);
struct mmu_rb_node *rbnode; rb_erase(node, root);
handler->ops->remove(root, rbnode, NULL);
while ((node = rb_first(root))) {
rbnode = rb_entry(node, struct mmu_rb_node, node);
rb_erase(node, root);
handler->ops->remove(root, rbnode, NULL);
}
} }
spin_unlock_irqrestore(&handler->lock, flags); spin_unlock_irqrestore(&handler->lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment