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>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index afad8ea4d888..0359600f5635 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -123,7 +123,7 @@ static void drbd_endio_write_sec_final(struct drbd_epoch_entry *e) __releases(lo
         list_add_tail(&e->w.list, &mdev->done_ee);
 
         /*
-         * Do not remove from the epoch_entries tree here: we did not send the
+         * Do not remove from the write_requests tree here: we did not send the
          * Ack yet and did not wake possibly waiting conflicting requests.
          * Removed from the tree from "drbd_process_done_ee" within the
          * appropriate w.cb (e_end_block/e_end_resync_block) or from