drbd: detach must not try to abort non-local requests
authorLars Ellenberg <lars.ellenberg@linbit.com>
Fri, 15 Jul 2011 21:52:44 +0000 (23:52 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:58:00 +0000 (16:58 +0100)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_main.c
drivers/block/drbd/drbd_req.c

Simple merge
Simple merge