drbd: disambiguation, s/DISCARD_CONCURRENT/RESOLVE_CONFLICTS/
authorLars Ellenberg <lars.ellenberg@linbit.com>
Wed, 1 Aug 2012 10:43:01 +0000 (12:43 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Fri, 9 Nov 2012 13:05:49 +0000 (14:05 +0100)
commit427c0434fc52f15bd762ddc6611e874df6cc5b8d
tree5d83c132fd0809884f5199a48ec6bbb9c7690ece
parentd4dabbe22d38752674c582e5bb40716a72397355
drbd: disambiguation, s/DISCARD_CONCURRENT/RESOLVE_CONFLICTS/

We don't discard anything here, really.
We resolve conflicting, concurrent writes to overlapping data blocks.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_int.h
drivers/block/drbd/drbd_nl.c
drivers/block/drbd/drbd_receiver.c