Commit 2990ca29 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Jens Axboe

drbd: interval tree: make removing an "empty" interval a no-op

Trying to remove an "empty" (just initialized, or "cleared") interval
from the tree, this results in an endless loop.

As we typically protect the tree with a spinlock_irq,
the result is a hung system.

Be nice to error cleanup code paths, ignore removal of empty intervals.
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Link: https://lore.kernel.org/r/20230113123538.144276-8-christoph.boehmwalder@linbit.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6d9be160
...@@ -95,6 +95,10 @@ drbd_contains_interval(struct rb_root *root, sector_t sector, ...@@ -95,6 +95,10 @@ drbd_contains_interval(struct rb_root *root, sector_t sector,
void void
drbd_remove_interval(struct rb_root *root, struct drbd_interval *this) drbd_remove_interval(struct rb_root *root, struct drbd_interval *this)
{ {
/* avoid endless loop */
if (drbd_interval_empty(this))
return;
rb_erase_augmented(&this->rb, root, &augment_callbacks); rb_erase_augmented(&this->rb, root, &augment_callbacks);
} }
......
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