diff options
author | Andreas Gruenbacher <agruen@linbit.com> | 2011-05-06 14:00:02 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:55:49 -0500 |
commit | 6139f60dc192e2c5478c1126d1aff7905dc0a98a (patch) | |
tree | 4a9dd1f51d99232c406ae0cc12b6673312e95799 /drivers/block/drbd/drbd_nl.c | |
parent | 7bac3e6f7e74993475a94487effe05dc1f68bdc7 (diff) |
drbd: Rename the want_lose field/flag to discard_my_data
This is what it is called in config files and on the command line as
well.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_nl.c')
-rw-r--r-- | drivers/block/drbd/drbd_nl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 195428ee6052..9a82306adf92 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c | |||
@@ -606,7 +606,7 @@ drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force) | |||
606 | mutex_lock(&mdev->tconn->conf_update); | 606 | mutex_lock(&mdev->tconn->conf_update); |
607 | nc = mdev->tconn->net_conf; | 607 | nc = mdev->tconn->net_conf; |
608 | if (nc) | 608 | if (nc) |
609 | nc->want_lose = 0; /* without copy; single bit op is atomic */ | 609 | nc->discard_my_data = 0; /* without copy; single bit op is atomic */ |
610 | mutex_unlock(&mdev->tconn->conf_update); | 610 | mutex_unlock(&mdev->tconn->conf_update); |
611 | 611 | ||
612 | set_disk_ro(mdev->vdisk, false); | 612 | set_disk_ro(mdev->vdisk, false); |
@@ -1738,7 +1738,7 @@ _check_net_options(struct drbd_tconn *tconn, struct net_conf *old_conf, struct n | |||
1738 | if (new_conf->wire_protocol == DRBD_PROT_A && fp == FP_STONITH) | 1738 | if (new_conf->wire_protocol == DRBD_PROT_A && fp == FP_STONITH) |
1739 | return ERR_STONITH_AND_PROT_A; | 1739 | return ERR_STONITH_AND_PROT_A; |
1740 | } | 1740 | } |
1741 | if (mdev->state.role == R_PRIMARY && new_conf->want_lose) | 1741 | if (mdev->state.role == R_PRIMARY && new_conf->discard_my_data) |
1742 | return ERR_DISCARD; | 1742 | return ERR_DISCARD; |
1743 | } | 1743 | } |
1744 | 1744 | ||