diff options
| author | Andreas Gruenbacher | 2011-01-27 14:42:51 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-09-28 10:26:32 +0200 |
| commit | 5e4722645afb27ee749ea65988544450f08f78ba (patch) | |
| tree | 971a99c34a30e56a8406f86aa2b9f48a08504082 /drivers/block/drbd/drbd_worker.c | |
| parent | drbd: Allow to wait for the completion of an epoch entry as well (diff) | |
| download | kernel-qcow2-linux-5e4722645afb27ee749ea65988544450f08f78ba.tar.gz kernel-qcow2-linux-5e4722645afb27ee749ea65988544450f08f78ba.tar.xz kernel-qcow2-linux-5e4722645afb27ee749ea65988544450f08f78ba.zip | |
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>
Diffstat (limited to 'drivers/block/drbd/drbd_worker.c')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 2 |
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 |