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_main.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_main.c')
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 22c2b4c881da..86c8bc5ac603 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -943,8 +943,8 @@ int __drbd_send_protocol(struct drbd_tconn *tconn) | |||
943 | p->after_sb_2p = cpu_to_be32(nc->after_sb_2p); | 943 | p->after_sb_2p = cpu_to_be32(nc->after_sb_2p); |
944 | p->two_primaries = cpu_to_be32(nc->two_primaries); | 944 | p->two_primaries = cpu_to_be32(nc->two_primaries); |
945 | cf = 0; | 945 | cf = 0; |
946 | if (nc->want_lose) | 946 | if (nc->discard_my_data) |
947 | cf |= CF_WANT_LOSE; | 947 | cf |= CF_DISCARD_MY_DATA; |
948 | if (nc->dry_run) | 948 | if (nc->dry_run) |
949 | cf |= CF_DRY_RUN; | 949 | cf |= CF_DRY_RUN; |
950 | p->conn_flags = cpu_to_be32(cf); | 950 | p->conn_flags = cpu_to_be32(cf); |
@@ -988,7 +988,7 @@ int _drbd_send_uuids(struct drbd_conf *mdev, u64 uuid_flags) | |||
988 | mdev->comm_bm_set = drbd_bm_total_weight(mdev); | 988 | mdev->comm_bm_set = drbd_bm_total_weight(mdev); |
989 | p->uuid[UI_SIZE] = cpu_to_be64(mdev->comm_bm_set); | 989 | p->uuid[UI_SIZE] = cpu_to_be64(mdev->comm_bm_set); |
990 | rcu_read_lock(); | 990 | rcu_read_lock(); |
991 | uuid_flags |= rcu_dereference(mdev->tconn->net_conf)->want_lose ? 1 : 0; | 991 | uuid_flags |= rcu_dereference(mdev->tconn->net_conf)->discard_my_data ? 1 : 0; |
992 | rcu_read_unlock(); | 992 | rcu_read_unlock(); |
993 | uuid_flags |= test_bit(CRASHED_PRIMARY, &mdev->flags) ? 2 : 0; | 993 | uuid_flags |= test_bit(CRASHED_PRIMARY, &mdev->flags) ? 2 : 0; |
994 | uuid_flags |= mdev->new_state_tmp.disk == D_INCONSISTENT ? 4 : 0; | 994 | uuid_flags |= mdev->new_state_tmp.disk == D_INCONSISTENT ? 4 : 0; |