diff options
author | Andreas Gruenbacher | 2011-06-28 14:18:12 +0200 |
---|---|---|
committer | Philipp Reisner | 2012-11-08 16:57:47 +0100 |
commit | 6dff2902208364d058746ee794da4d960f6eec6f (patch) | |
tree | 61d93721a5f8c9625336473254c9bfe85c721b9b /drivers/block/drbd/drbd_main.c | |
parent | drbd: Remove dead code (diff) | |
download | kernel-qcow2-linux-6dff2902208364d058746ee794da4d960f6eec6f.tar.gz kernel-qcow2-linux-6dff2902208364d058746ee794da4d960f6eec6f.tar.xz kernel-qcow2-linux-6dff2902208364d058746ee794da4d960f6eec6f.zip |
drbd: Rename --dry-run to --tentative
drbdadm already has a --dry-run option, so this option cannot directly be
passed through to drbdsetup. Rename the drbdsetup option to resolve this
conflict.
For backward compatibility, make --dry-run an alias of --tentative.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 933d4767c110..72b1dfa4b656 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -926,7 +926,7 @@ int __drbd_send_protocol(struct drbd_tconn *tconn, enum drbd_packet cmd) rcu_read_lock(); nc = rcu_dereference(tconn->net_conf); - if (nc->dry_run && tconn->agreed_pro_version < 92) { + if (nc->tentative && tconn->agreed_pro_version < 92) { rcu_read_unlock(); mutex_unlock(&sock->mutex); conn_err(tconn, "--dry-run is not supported by peer"); @@ -945,7 +945,7 @@ int __drbd_send_protocol(struct drbd_tconn *tconn, enum drbd_packet cmd) cf = 0; if (nc->discard_my_data) cf |= CF_DISCARD_MY_DATA; - if (nc->dry_run) + if (nc->tentative) cf |= CF_DRY_RUN; p->conn_flags = cpu_to_be32(cf); |