]> git.karo-electronics.de Git - linux-beck.git/commit
drbd: compute the end before rb_insert_augmented()
authorLai Jiangshan <laijs@cn.fujitsu.com>
Thu, 18 Sep 2014 14:49:41 +0000 (16:49 +0200)
committerJens Axboe <axboe@fb.com>
Thu, 18 Sep 2014 15:00:16 +0000 (09:00 -0600)
commit82cfb90bc99d7b7e0ec62d0505b9d4f06805d5db
treea2e2292a19bef24b53dc34966e13d7dda77e5b16
parent590001c229e86a0adab4a61a6d668940d7ce5299
drbd: compute the end before rb_insert_augmented()

Commit 98683650 "Merge branch 'drbd-8.4_ed6' into
for-3.8-drivers-drbd-8.4_ed6" switches to the new augment API, but the
new API requires that the tree is augmented before rb_insert_augmented()
is called, which is missing.

So we add the augment-code to drbd_insert_interval() when it travels the
tree up to down before rb_insert_augmented().  See the example in
include/linux/interval_tree_generic.h or Documentation/rbtree.txt.

drbd_insert_interval() may cancel the insertion when traveling, in this
case, the just added augment-code does nothing before cancel since the
@this node is already in the subtrees in this case.

CC: Michel Lespinasse <walken@google.com>
CC: stable@kernel.org # v3.10+
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Andreas Gruenbacher <agruen@linbit.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/block/drbd/drbd_interval.c