commit d4dabbe22d38752674c582e5bb40716a72397355
author Lars Ellenberg <lars.ellenberg@linbit.com> Wed Aug 01 12:33:51 2012 +0200
committer Philipp Reisner <philipp.reisner@linbit.com> Fri Nov 09 14:05:49 2012 +0100
tree 51a89e48ba52a80fa93b3c37390e5b772a2b7bb8
parent 232fd3f4a01f45d5402c2e03f7c8815d80bec25b

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>