drbd: fix regression: attach while connected failed
authorLars Ellenberg <lars.ellenberg@linbit.com>
Thu, 1 Apr 2010 13:13:19 +0000 (15:13 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Mon, 17 May 2010 23:06:07 +0000 (01:06 +0200)
commite0f83012dc510b0be92ee2d59227a573a36777b8
tree891cfe0ba0503f51db260ed189f3f760b85b274d
parente4f925e12ea5daaa9baf2dd5af9c4951721dae95
drbd: fix regression: attach while connected failed

commit e4f925e12ea5daaa9baf2dd5af9c4951721dae95
Author: Philipp Reisner <philipp.reisner@linbit.com>
Date:   Wed Mar 17 14:18:41 2010 +0100

    drbd: Do not upgrade state to Outdated if already Inconsistent

prevented the necessary state transition for attaching while connected
(Diskless -> Consistent respectively Outdated).
This is the fix for the fix.

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