mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
drbd: Correctly handle resources without volumes
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
parent
a67e1d9e8c
commit
e0e1665381
2 changed files with 17 additions and 3 deletions
|
@ -1095,7 +1095,8 @@ static void conn_reconfig_done(struct drbd_tconn *tconn)
|
||||||
{
|
{
|
||||||
bool stop_threads;
|
bool stop_threads;
|
||||||
spin_lock_irq(&tconn->req_lock);
|
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);
|
spin_unlock_irq(&tconn->req_lock);
|
||||||
if (stop_threads) {
|
if (stop_threads) {
|
||||||
/* asender is implicitly stopped by receiver
|
/* asender is implicitly stopped by receiver
|
||||||
|
|
|
@ -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)
|
void conn_old_common_state(struct drbd_tconn *tconn, union drbd_state *pcs, enum chg_state_flags *pf)
|
||||||
{
|
{
|
||||||
enum chg_state_flags flags = ~0;
|
enum chg_state_flags flags = ~0;
|
||||||
union drbd_dev_state os, cs = {}; /* old_state, common_state */
|
|
||||||
struct drbd_conf *mdev;
|
struct drbd_conf *mdev;
|
||||||
int vnr, first_vol = 1;
|
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();
|
rcu_read_lock();
|
||||||
idr_for_each_entry(&tconn->volumes, mdev, vnr) {
|
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,
|
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 *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 = {
|
union drbd_state ns_min = {
|
||||||
{ .role = R_MASK,
|
{ .role = R_MASK,
|
||||||
.peer = R_MASK,
|
.peer = R_MASK,
|
||||||
|
.conn = val.conn,
|
||||||
.disk = D_MASK,
|
.disk = D_MASK,
|
||||||
.pdsk = D_MASK
|
.pdsk = D_MASK
|
||||||
} };
|
} };
|
||||||
|
|
Loading…
Reference in a new issue