aboutsummaryrefslogtreecommitdiff
path: root/include/linux/drbd_genl.h
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2011-06-28 14:18:12 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:57:47 +0100
commit6dff2902208364d058746ee794da4d960f6eec6f (patch)
tree61d93721a5f8c9625336473254c9bfe85c721b9b /include/linux/drbd_genl.h
parentd0fa7fd680a56a3fd52817fe93c1c8abe7164ef1 (diff)
downloadvexpress-lsk-6dff2902208364d058746ee794da4d960f6eec6f.tar.gz
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 'include/linux/drbd_genl.h')
-rw-r--r--include/linux/drbd_genl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index b93db6c8388..e879a932438 100644
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -164,7 +164,7 @@ GENL_struct(DRBD_NLA_NET_CONF, 5, net_conf,
__flg_field(25, DRBD_GENLA_F_MANDATORY | DRBD_F_INVARIANT, discard_my_data)
__flg_field_def(26, DRBD_GENLA_F_MANDATORY, tcp_cork, DRBD_TCP_CORK_DEF)
__flg_field_def(27, DRBD_GENLA_F_MANDATORY, always_asbp, DRBD_ALWAYS_ASBP_DEF)
- __flg_field(28, DRBD_GENLA_F_MANDATORY | DRBD_F_INVARIANT, dry_run)
+ __flg_field(28, DRBD_GENLA_F_MANDATORY | DRBD_F_INVARIANT, tentative)
__flg_field_def(29, DRBD_GENLA_F_MANDATORY, use_rle, DRBD_USE_RLE_DEF)
)