drbd: _req_conflicts(): Get rid of the epoch_entries tree
authorAndreas Gruenbacher <agruen@linbit.com>
Thu, 27 Jan 2011 13:42:51 +0000 (14:42 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Wed, 28 Sep 2011 08:26:32 +0000 (10:26 +0200)
commit5e4722645afb27ee749ea65988544450f08f78ba
tree971a99c34a30e56a8406f86aa2b9f48a08504082
parent53840641bb1feff8c08acdba9de4c0f8b8674df5
drbd: _req_conflicts(): Get rid of the epoch_entries tree

Instead of keeping a separate tree for local and remote write requests
for finding requests and for conflict detection, use the same tree for
both purposes.  Introduce a flag to allow distinguishing the two
possible types of entries in this tree.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_interval.h
drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_receiver.c
drivers/block/drbd/drbd_req.c
drivers/block/drbd/drbd_worker.c