Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9510b241 authored by Philipp Reisner's avatar Philipp Reisner
Browse files

drbd: Fixed state transitions in case reading meta data failes 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 2ffca4f3

drivers/block/drbd/drbd_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -1645,7 +1645,7 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info) 
 force_diskless_dec:

	put_ldev(mdev);

 force_diskless:

	drbd_force_state(mdev, NS(disk, D_FAILED));

	drbd_force_state(mdev, NS(disk, D_DISKLESS));

	drbd_md_sync(mdev);

 fail:

	conn_reconfig_done(mdev->tconn);

drivers/block/drbd/drbd_state.c

+0 −7
Original line number Diff line number Diff line
@@ -655,13 +655,6 @@ is_valid_transition(union drbd_state os, union drbd_state ns) 
	if (ns.disk == D_FAILED && os.disk == D_DISKLESS)

		rv = SS_IS_DISKLESS;



	/* if we are only D_ATTACHING yet,

	 * we can (and should) go directly to D_DISKLESS. */

	if (ns.disk == D_FAILED && os.disk == D_ATTACHING) {

		printk("TODO: FIX ME\n");

		rv = SS_IS_DISKLESS;

	}



	return rv;

}