diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-06-10 16:46:54 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 14:56:50 +0200 |
| commit | 999122bc188a4d0a4847bdf1915d357bd6ab53dc (patch) | |
| tree | 0f9362cc0b5c58f48b9836bf40ee28e095d7dd5a /drivers/block | |
| parent | drbd: Now we need to handle the ed_uuid of an diskless, unconnected primary c... (diff) | |
| download | linux-999122bc188a4d0a4847bdf1915d357bd6ab53dc.tar.xz linux-999122bc188a4d0a4847bdf1915d357bd6ab53dc.zip | |
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 3 |
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 if (ns.conn == C_STANDALONE && ns.disk == D_DISKLESS && ns.role == R_SECONDARY) ns.aftr_isp = 0; - if (ns.conn <= C_DISCONNECTING && ns.disk == D_DISKLESS) - ns.pdsk = D_UNKNOWN; - /* Abort resync if a disk fails/detaches */ if (os.conn > C_CONNECTED && ns.conn > C_CONNECTED && (ns.disk <= D_FAILED || ns.pdsk <= D_FAILED)) { |