drbd: Correctly handle resources without volumes (e0e16653) · Commits · e / devices / android_kernel_teracube_emerald

drivers/block/drbd/drbd_nl.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1095,7 +1095,8 @@ static void conn_reconfig_done(struct drbd_tconn *tconn)
		{
		bool stop_threads;
		spin_lock_irq(&tconn->req_lock);
		stop_threads = conn_all_vols_unconf(tconn);
		stop_threads = conn_all_vols_unconf(tconn) &&
		tconn->cstate == C_STANDALONE;
		spin_unlock_irq(&tconn->req_lock);
		if (stop_threads) {
		/* asender is implicitly stopped by receiver

+15 −2

Original line number	Diff line number	Diff line
		@@ -1491,9 +1491,15 @@ static int w_after_conn_state_ch(struct drbd_work *w, int unused)
		void conn_old_common_state(struct drbd_tconn tconn, union drbd_state pcs, enum chg_state_flags *pf)
		{
		enum chg_state_flags flags = ~0;
		union drbd_dev_state os, cs = {}; /* old_state, common_state */
		struct drbd_conf *mdev;
		int vnr, first_vol = 1;
		union drbd_dev_state os, cs = {
		{ .role = R_SECONDARY,
		.peer = R_UNKNOWN,
		.conn = tconn->cstate,
		.disk = D_DISKLESS,
		.pdsk = D_UNKNOWN,
		} };

		rcu_read_lock();
		idr_for_each_entry(&tconn->volumes, mdev, vnr) {
		@@ -1574,10 +1580,17 @@ void
		conn_set_state(struct drbd_tconn *tconn, union drbd_state mask, union drbd_state val,
		union drbd_state pns_min, union drbd_state pns_max, enum chg_state_flags flags)
		{
		union drbd_state ns, os, ns_max = { };
		union drbd_state ns, os, ns_max = {
		{ .role = R_SECONDARY,
		.peer = R_UNKNOWN,
		.conn = val.conn,
		.disk = D_DISKLESS,
		.pdsk = D_UNKNOWN
		} };
		union drbd_state ns_min = {
		{ .role = R_MASK,
		.peer = R_MASK,
		.conn = val.conn,
		.disk = D_MASK,
		.pdsk = D_MASK
		} };