aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-06-10 10:46:54 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-10-14 08:56:50 -0400
commit999122bc188a4d0a4847bdf1915d357bd6ab53dc (patch)
tree0f9362cc0b5c58f48b9836bf40ee28e095d7dd5a
parent18a50fa213d46d5592f6542c91ab4c4760cf346c (diff)
drbd: Removing a by now obsolete clause in the state sanitizing
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
-rw-r--r--drivers/block/drbd/drbd_main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index c701805ed4b9..c502648b7b40 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -847,9 +847,6 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state
847 if (ns.conn == C_STANDALONE && ns.disk == D_DISKLESS && ns.role == R_SECONDARY) 847 if (ns.conn == C_STANDALONE && ns.disk == D_DISKLESS && ns.role == R_SECONDARY)
848 ns.aftr_isp = 0; 848 ns.aftr_isp = 0;
849 849
850 if (ns.conn <= C_DISCONNECTING && ns.disk == D_DISKLESS)
851 ns.pdsk = D_UNKNOWN;
852
853 /* Abort resync if a disk fails/detaches */ 850 /* Abort resync if a disk fails/detaches */
854 if (os.conn > C_CONNECTED && ns.conn > C_CONNECTED && 851 if (os.conn > C_CONNECTED && ns.conn > C_CONNECTED &&
855 (ns.disk <= D_FAILED || ns.pdsk <= D_FAILED)) { 852 (ns.disk <= D_FAILED || ns.pdsk <= D_FAILED)) {