projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 232fd3f) | patch
drbd: disambiguation, s/P_DISCARD_WRITE/P_SUPERSEDED/
authorLars Ellenberg <lars.ellenberg@linbit.com>
Wed, 1 Aug 2012 10:33:51 +0000 (12:33 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 9 Nov 2012 13:05:49 +0000 (14:05 +0100)
commitd4dabbe22d38752674c582e5bb40716a72397355
tree51a89e48ba52a80fa93b3c37390e5b772a2b7bb8tree | snapshot
parent232fd3f4a01f45d5402c2e03f7c8815d80bec25bcommit | diff
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>
drivers/block/drbd/drbd_int.h diff | blob | history
drivers/block/drbd/drbd_main.c diff | blob | history
drivers/block/drbd/drbd_receiver.c diff | blob | history
drivers/block/drbd/drbd_req.c diff | blob | history
drivers/block/drbd/drbd_req.h diff | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git