aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_nl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 35bb572a2076..d1073705bf1f 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1829,7 +1829,7 @@ _check_net_options(struct drbd_tconn *tconn, struct net_conf *old_conf, struct n
1829 return ERR_STONITH_AND_PROT_A; 1829 return ERR_STONITH_AND_PROT_A;
1830 } 1830 }
1831 if (mdev->state.role == R_PRIMARY && new_conf->discard_my_data) 1831 if (mdev->state.role == R_PRIMARY && new_conf->discard_my_data)
1832 return ERR_DISCARD; 1832 return ERR_DISCARD_IMPOSSIBLE;
1833 } 1833 }
1834 1834
1835 if (new_conf->on_congestion != OC_BLOCK && new_conf->wire_protocol != DRBD_PROT_A) 1835 if (new_conf->on_congestion != OC_BLOCK && new_conf->wire_protocol != DRBD_PROT_A)