diff options
| author | Andreas Gruenbacher | 2011-05-06 20:00:02 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:55:49 +0100 |
| commit | 6139f60dc192e2c5478c1126d1aff7905dc0a98a (patch) | |
| tree | 4a9dd1f51d99232c406ae0cc12b6673312e95799 /drivers/block/drbd/drbd_nl.c | |
| parent | drbd: Also define the default values of boolean flags in a single place (diff) | |
| download | kernel-qcow2-linux-6139f60dc192e2c5478c1126d1aff7905dc0a98a.tar.gz kernel-qcow2-linux-6139f60dc192e2c5478c1126d1aff7905dc0a98a.tar.xz kernel-qcow2-linux-6139f60dc192e2c5478c1126d1aff7905dc0a98a.zip | |
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) mutex_lock(&mdev->tconn->conf_update); nc = mdev->tconn->net_conf; if (nc) - nc->want_lose = 0; /* without copy; single bit op is atomic */ + nc->discard_my_data = 0; /* without copy; single bit op is atomic */ mutex_unlock(&mdev->tconn->conf_update); set_disk_ro(mdev->vdisk, false); @@ -1738,7 +1738,7 @@ _check_net_options(struct drbd_tconn *tconn, struct net_conf *old_conf, struct n if (new_conf->wire_protocol == DRBD_PROT_A && fp == FP_STONITH) return ERR_STONITH_AND_PROT_A; } - if (mdev->state.role == R_PRIMARY && new_conf->want_lose) + if (mdev->state.role == R_PRIMARY && new_conf->discard_my_data) return ERR_DISCARD; } |