From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Wed, 1 Aug 2012 10:33:51 +0000 (+0200)
Subject: drbd: disambiguation, s/P_DISCARD_WRITE/P_SUPERSEDED/
X-Git-Tag: v3.8-rc1~78^2~18^2~37
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4dabbe22d38752674c582e5bb40716a72397355;p=pandora-kernel.git

drbd: disambiguation, s/P_DISCARD_WRITE/P_SUPERSEDED/

To avoid confusion with REQ_DISCARD aka TRIM, rename our
"discard concurrent write acks" from P_DISCARD_WRITE to P_SUPERSEDED.

At the same time, rename the drbd request event DISCARD_WRITE
to CONFLICT_RESOLVED. It already triggers both successful completion
or restart of the request, depending on our RQ_POSTPONED flag.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---

Reading git-diff-tree failed